ARM: dts: imx7: Move nodes which have no reg property out of bus

Move usbphynop1, usbphynop2, usbhypnop3, replicator and timer and nodes
from soc node to root node.

The nodes that have been moved do not have any register properties and thus
shouldn't be placed on the bus.

This fixes the following build warnings with W=1:

arch/arm/boot/dts/imx7d-cl-som-imx7.dtb: Warning (simple_bus_reg): Node /soc/replicator missing or empty reg/ranges property
arch/arm/boot/dts/imx7d-cl-som-imx7.dtb: Warning (simple_bus_reg): Node /soc/timer missing or empty reg/ranges property
arch/arm/boot/dts/imx7d-cl-som-imx7.dtb: Warning (simple_bus_reg): Node /soc/aips-bus@30800000/usbphynop1 missing or empty reg/ranges property
arch/arm/boot/dts/imx7d-cl-som-imx7.dtb: Warning (simple_bus_reg): Node /soc/aips-bus@30800000/usbphynop3 missing or empty reg/ranges property
arch/arm/boot/dts/imx7d-cl-som-imx7.dtb: Warning (simple_bus_reg): Node /soc/aips-bus@30800000/usbphynop2 missing or empty reg/ranges property

Based on a patch from Simon Horman for r8a7795.dtsi.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 78782579c5fd49b05b24ef9077f8ccf987e09df7..9d92725226323d094a8da3306f0ff199d8407617 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -63,6 +63,13 @@ cpu1: cpu@1 {
                };
        };
 
+       usbphynop2: usbphynop2 {
+               compatible = "usb-nop-xceiv";
+               clocks = <&clks IMX7D_USB_PHY2_CLK>;
+               clock-names = "main_clk";
+               #phy-cells = <0>;
+       };
+
        soc {
                etm@3007d000 {
                        compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -105,13 +112,6 @@ usbmisc2: usbmisc@30b20200 {
                reg = <0x30b20200 0x200>;
        };
 
-       usbphynop2: usbphynop2 {
-               compatible = "usb-nop-xceiv";
-               clocks = <&clks IMX7D_USB_PHY2_CLK>;
-               clock-names = "main_clk";
-               #phy-cells = <0>;
-       };
-
        fec2: ethernet@30bf0000 {
                compatible = "fsl,imx7d-fec", "fsl,imx6sx-fec";
                reg = <0x30bf0000 0x10000>;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index e718fd28ceeb30ab63fe4c7f55a28910454fb61d..81467ac3b586c258b5a3f8cab7255dff312fa7f4 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -116,6 +116,66 @@ osc: clock-osc {
                clock-output-names = "osc";
        };
 
+       usbphynop1: usbphynop1 {
+               compatible = "usb-nop-xceiv";
+               clocks = <&clks IMX7D_USB_PHY1_CLK>;
+               clock-names = "main_clk";
+               #phy-cells = <0>;
+       };
+
+       usbphynop3: usbphynop3 {
+               compatible = "usb-nop-xceiv";
+               clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
+               clock-names = "main_clk";
+               #phy-cells = <0>;
+       };
+
+
+       replicator {
+               /*
+                * non-configurable replicators don't show up on the
+                * AMBA bus.  As such no need to add "arm,primecell"
+                */
+               compatible = "arm,coresight-replicator";
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                               /* replicator output ports */
+                       port@0 {
+                               reg = <0>;
+                               replicator_out_port0: endpoint {
+                                       remote-endpoint = <&tpiu_in_port>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               replicator_out_port1: endpoint {
+                                       remote-endpoint = <&etr_in_port>;
+                               };
+                       };
+
+                       /* replicator input port */
+                       port@2 {
+                               reg = <0>;
+                               replicator_in_port0: endpoint {
+                                       slave-mode;
+                                       remote-endpoint = <&etf_out_port>;
+                               };
+                       };
+               };
+       };
+
+       timer {
+               compatible = "arm,armv7-timer";
+               interrupt-parent = <&intc>;
+               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                            <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -260,43 +320,6 @@ tpiu_in_port: endpoint {
                        };
                };
 
-               replicator {
-                       /*
-                        * non-configurable replicators don't show up on the
-                        * AMBA bus.  As such no need to add "arm,primecell"
-                        */
-                       compatible = "arm,coresight-replicator";
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               /* replicator output ports */
-                               port@0 {
-                                       reg = <0>;
-                                       replicator_out_port0: endpoint {
-                                               remote-endpoint = <&tpiu_in_port>;
-                                       };
-                               };
-
-                               port@1 {
-                                       reg = <1>;
-                                       replicator_out_port1: endpoint {
-                                               remote-endpoint = <&etr_in_port>;
-                                       };
-                               };
-
-                               /* replicator input port */
-                               port@2 {
-                                       reg = <0>;
-                                       replicator_in_port0: endpoint {
-                                               slave-mode;
-                                               remote-endpoint = <&etf_out_port>;
-                                       };
-                               };
-                       };
-               };
-
                intc: interrupt-controller@31001000 {
                        compatible = "arm,cortex-a7-gic";
                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
@@ -309,15 +332,6 @@ intc: interrupt-controller@31001000 {
                              <0x31006000 0x2000>;
                };
 
-               timer {
-                       compatible = "arm,armv7-timer";
-                       interrupt-parent = <&intc>;
-                       interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                    <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
-               };
-
                aips1: aips-bus@30000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
@@ -945,20 +959,6 @@ usbmisc3: usbmisc@30b30200 {
                                reg = <0x30b30200 0x200>;
                        };
 
-                       usbphynop1: usbphynop1 {
-                               compatible = "usb-nop-xceiv";
-                               clocks = <&clks IMX7D_USB_PHY1_CLK>;
-                               clock-names = "main_clk";
-                               #phy-cells = <0>;
-                       };
-
-                       usbphynop3: usbphynop3 {
-                               compatible = "usb-nop-xceiv";
-                               clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
-                               clock-names = "main_clk";
-                               #phy-cells = <0>;
-                       };
-
                        usdhc1: usdhc@30b40000 {
                                compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x30b40000 0x10000>;