arm: tegra: dts: Move host nodes to tegra124-soc
Alex Van Brunt [Fri, 6 Dec 2013 18:31:38 +0000 (10:31 -0800)]
The host engines are part of the SoC. So, move the DT nodes to
tegra124-soc.dtsi. This allows the SoC DT nodes to be shared by other chips.

Change-Id: I2bc27a727007712db6607143a8c40b638a4839be
Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com>
Reviewed-on: http://git-master/r/355150
GVS: Gerrit_Virtual_Submit
Reviewed-by: Peng Du <pdu@nvidia.com>
Tested-by: Peng Du <pdu@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Chao Xu <cxu@nvidia.com>

arch/arm/boot/dts/tegra124-soc.dtsi
arch/arm/boot/dts/tegra124.dtsi

index a444abc..fd50e46 100644 (file)
                        status = "disabled";
                };
        };
+
+       host1x {
+               compatible = "nvidia,tegra124-host1x", "simple-bus";
+               reg = <0x50000000 0x00028000>;
+               interrupts = <0 65 0x04   /* mpcore syncpt */
+                             0 67 0x04>; /* mpcore general */
+               nvidia,memory-clients = <4 6 7 17>;
+
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               ranges = <0x53000000 0x53000000 0x06000000>;
+
+               vi {
+                       compatible = "nvidia,tegra124-vi";
+                       reg = <0x54080000 0x00040000>;
+                       nvidia,memory-clients = <18>;
+               };
+
+               isp@54600000 {
+                       compatible = "nvidia,tegra124-isp";
+                       reg = <0x54600000 0x00040000>;
+                       nvidia,memory-clients = <8 29>;
+               };
+
+               isp@54680000 {
+                       compatible = "nvidia,tegra124-isp";
+                       reg = <0x54680000 0x00040000>;
+                       nvidia,memory-clients = <8 29>;
+               };
+
+               dc@54200000 {
+                       compatible = "nvidia,tegra124-dc";
+                       reg = <0x54200000 0x00040000>;
+                       interrupts = <0 73 0x04>;
+                       nvidia,memory-clients = <2>;
+                       status = "disabled";
+
+                       rgb {
+                               status = "disabled";
+                       };
+               };
+
+               dc@54240000 {
+                       compatible = "nvidia,tegra124-dc";
+                       reg = <0x54240000 0x00040000>;
+                       interrupts = <0 74 0x04>;
+                       nvidia,memory-clients = <3>;
+                       status = "disabled";
+
+                       rgb {
+                               status = "disabled";
+                       };
+               };
+
+               hdmi {
+                       compatible = "nvidia,tegra124-hdmi";
+                       reg = <0x54280000 0x00040000>;
+                       interrupts = <0 75 0x04>;
+                       status = "okay";
+               };
+
+               dsi {
+                       compatible = "nvidia,tegra124-dsi";
+                       reg = <0x54300000 0x00040000>,
+                             <0x54400000 0x00040000>;
+                       status = "disabled";
+               };
+
+               vic {
+                       compatible = "nvidia,tegra124-vic";
+                       reg = <0x54340000 0x00040000>;
+                       nvidia,memory-clients = <19>;
+               };
+
+               msenc {
+                       compatible = "nvidia,tegra124-msenc";
+                       reg = <0x544c0000 0x00040000>;
+                       nvidia,memory-clients = <11>;
+               };
+
+               tsec {
+                       compatible = "nvidia,tegra124-tsec";
+                       reg = <0x54500000 0x00040000>;
+                       nvidia,memory-clients = <23>;
+               };
+
+               gk20a {
+                       compatible = "nvidia,tegra124-gk20a";
+                       reg = <0x57000000 0x01000000>,
+                             <0x58000000 0x01000000>,
+                             <0x538F0000 0x00001000>;
+                       interrupts = <0 157 0x04
+                                     0 158 0x04>;
+                       nvidia,memory-clients = <30 31>;
+               };
+       };
+
 };
index 2eabaef..69bfe5b 100644 (file)
                status = "disable";
        };
 
-       host1x {
-               compatible = "nvidia,tegra124-host1x", "simple-bus";
-               reg = <0x50000000 0x00028000>;
-               interrupts = <0 65 0x04   /* mpcore syncpt */
-                             0 67 0x04>; /* mpcore general */
-               nvidia,memory-clients = <4 6 7 17>;
-
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               ranges = <0x53000000 0x53000000 0x06000000>;
-
-               vi {
-                       compatible = "nvidia,tegra124-vi";
-                       reg = <0x54080000 0x00040000>;
-                       nvidia,memory-clients = <18>;
-               };
-
-               isp@54600000 {
-                       compatible = "nvidia,tegra124-isp";
-                       reg = <0x54600000 0x00040000>;
-                       nvidia,memory-clients = <8 29>;
-               };
-
-               isp@54680000 {
-                       compatible = "nvidia,tegra124-isp";
-                       reg = <0x54680000 0x00040000>;
-                       nvidia,memory-clients = <8 29>;
-               };
-
-               dc@54200000 {
-                       compatible = "nvidia,tegra124-dc";
-                       reg = <0x54200000 0x00040000>;
-                       interrupts = <0 73 0x04>;
-                       nvidia,memory-clients = <2>;
-                       status = "disabled";
-
-                       rgb {
-                               status = "disabled";
-                       };
-               };
-
-               dc@54240000 {
-                       compatible = "nvidia,tegra124-dc";
-                       reg = <0x54240000 0x00040000>;
-                       interrupts = <0 74 0x04>;
-                       nvidia,memory-clients = <3>;
-                       status = "disabled";
-
-                       rgb {
-                               status = "disabled";
-                       };
-               };
-
-               hdmi {
-                       compatible = "nvidia,tegra124-hdmi";
-                       reg = <0x54280000 0x00040000>;
-                       interrupts = <0 75 0x04>;
-                       status = "okay";
-               };
-
-               dsi {
-                       compatible = "nvidia,tegra124-dsi";
-                       reg = <0x54300000 0x00040000>,
-                             <0x54400000 0x00040000>;
-                       status = "disabled";
-               };
-
-               vic {
-                       compatible = "nvidia,tegra124-vic";
-                       reg = <0x54340000 0x00040000>;
-                       nvidia,memory-clients = <19>;
-               };
-
-               msenc {
-                       compatible = "nvidia,tegra124-msenc";
-                       reg = <0x544c0000 0x00040000>;
-                       nvidia,memory-clients = <11>;
-               };
-
-               tsec {
-                       compatible = "nvidia,tegra124-tsec";
-                       reg = <0x54500000 0x00040000>;
-                       nvidia,memory-clients = <23>;
-               };
-
-               gk20a {
-                       compatible = "nvidia,tegra124-gk20a";
-                       reg = <0x57000000 0x01000000>,
-                             <0x58000000 0x01000000>,
-                             <0x538F0000 0x00001000>;
-                       interrupts = <0 157 0x04
-                                     0 158 0x04>;
-                       nvidia,memory-clients = <30 31>;
-               };
-       };
 
        mipical {
                compatible = "nvidia,tegra124-mipical";