arm64: zynqmp: Move nodes which have no reg property out of bus

Nodes without reg properties shouldn't be placed in amba node.
Move them out.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp-clk.dtsi b/arch/arm/dts/zynqmp-clk.dtsi
index b64a0a6f6ba77c4ff5c8e44db0acaf398d7db310..f6e83e15132aa8fb407d726198753ec0873fdb33 100644 (file)
--- a/arch/arm/dts/zynqmp-clk.dtsi
+++ b/arch/arm/dts/zynqmp-clk.dtsi
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-&amba {
+/ {
        clk100: clk100 {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-ep108-clk.dtsi b/arch/arm/dts/zynqmp-ep108-clk.dtsi
index 1c2efe459d4f31f6d33c542c16a55eeb85a95368..12d9fe14988831b0e357fd0ef4af2a1b4acace97 100644 (file)
--- a/arch/arm/dts/zynqmp-ep108-clk.dtsi
+++ b/arch/arm/dts/zynqmp-ep108-clk.dtsi
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-&amba {
+/ {
        misc_clk: misc_clk {
                compatible = "fixed-clock";
                #clock-cells = <0>;

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 788ad0473efef27667039c5be11a4ffec7e739f4..10a53bb9f04998c777afd65bc728ca50540aeaeb 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -307,6 +307,54 @@
                #reset-cells = <1>;
        };
 
+       xlnx_dp_snd_card: dp_snd_card {
+               compatible = "xlnx,dp-snd-card";
+               status = "disabled";
+               xlnx,dp-snd-pcm = <&xlnx_dp_snd_pcm0>, <&xlnx_dp_snd_pcm1>;
+               xlnx,dp-snd-codec = <&xlnx_dp_snd_codec0>;
+       };
+
+       xlnx_dp_snd_codec0: dp_snd_codec0 {
+               compatible = "xlnx,dp-snd-codec";
+               status = "disabled";
+               clock-names = "aud_clk";
+       };
+
+       xlnx_dp_snd_pcm0: dp_snd_pcm0 {
+               compatible = "xlnx,dp-snd-pcm";
+               status = "disabled";
+               dmas = <&xlnx_dpdma 4>;
+               dma-names = "tx";
+       };
+
+       xlnx_dp_snd_pcm1: dp_snd_pcm1 {
+               compatible = "xlnx,dp-snd-pcm";
+               status = "disabled";
+               dmas = <&xlnx_dpdma 5>;
+               dma-names = "tx";
+       };
+
+       xilinx_drm: xilinx_drm {
+               compatible = "xlnx,drm";
+               status = "disabled";
+               xlnx,encoder-slave = <&xlnx_dp>;
+               xlnx,connector-type = "DisplayPort";
+               xlnx,dp-sub = <&xlnx_dp_sub>;
+               planes {
+                       xlnx,pixel-format = "rgb565";
+                       plane0 {
+                               dmas = <&xlnx_dpdma 3>;
+                               dma-names = "dma0";
+                       };
+                       plane1 {
+                               dmas = <&xlnx_dpdma 0>,
+                                       <&xlnx_dpdma 1>,
+                                       <&xlnx_dpdma 2>;
+                               dma-names = "dma0", "dma1", "dma2";
+                       };
+               };
+       };
+
        amba_apu: amba_apu@0 {
                compatible = "simple-bus";
                #address-cells = <2>;
@@ -1044,27 +1092,6 @@
                        };
                };
 
-               xilinx_drm: xilinx_drm {
-                       compatible = "xlnx,drm";
-                       status = "disabled";
-                       xlnx,encoder-slave = <&xlnx_dp>;
-                       xlnx,connector-type = "DisplayPort";
-                       xlnx,dp-sub = <&xlnx_dp_sub>;
-                       planes {
-                               xlnx,pixel-format = "rgb565";
-                               plane0 {
-                                       dmas = <&xlnx_dpdma 3>;
-                                       dma-names = "dma0";
-                               };
-                               plane1 {
-                                       dmas = <&xlnx_dpdma 0>,
-                                              <&xlnx_dpdma 1>,
-                                              <&xlnx_dpdma 2>;
-                                       dma-names = "dma0", "dma1", "dma2";
-                               };
-                       };
-               };
-
                xlnx_dp: dp@fd4a0000 {
                        compatible = "xlnx,v-dp";
                        status = "disabled";
@@ -1085,33 +1112,6 @@
                        xlnx,max-pclock-frequency = <300000>;
                };
 
-               xlnx_dp_snd_card: dp_snd_card {
-                       compatible = "xlnx,dp-snd-card";
-                       status = "disabled";
-                       xlnx,dp-snd-pcm = <&xlnx_dp_snd_pcm0>, <&xlnx_dp_snd_pcm1>;
-                       xlnx,dp-snd-codec = <&xlnx_dp_snd_codec0>;
-               };
-
-               xlnx_dp_snd_codec0: dp_snd_codec0 {
-                       compatible = "xlnx,dp-snd-codec";
-                       status = "disabled";
-                       clock-names = "aud_clk";
-               };
-
-               xlnx_dp_snd_pcm0: dp_snd_pcm0 {
-                       compatible = "xlnx,dp-snd-pcm";
-                       status = "disabled";
-                       dmas = <&xlnx_dpdma 4>;
-                       dma-names = "tx";
-               };
-
-               xlnx_dp_snd_pcm1: dp_snd_pcm1 {
-                       compatible = "xlnx,dp-snd-pcm";
-                       status = "disabled";
-                       dmas = <&xlnx_dpdma 5>;
-                       dma-names = "tx";
-               };
-
                xlnx_dp_sub: dp_sub@fd4aa000 {
                        compatible = "xlnx,dp-sub";
                        status = "disabled";