ARM: dts: imx28-cfa10049: Move i2cmux out of bus node

Move i2cmux node from soc node to root node.

i2cmux node does 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/imx28-cfa10049.dtb: Warning (simple_bus_reg): Node /apb@80000000/apbx@80040000/i2cmux missing or empty reg/ranges property

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 4cd52d5..60e5c7f 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -19,6 +19,71 @@
        model = "Crystalfontz CFA-10049 Board";
        compatible = "crystalfontz,cfa10049", "crystalfontz,cfa10036", "fsl,imx28";
 
+       i2cmux {
+               compatible = "i2c-mux-gpio";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&i2cmux_pins_cfa10049>;
+               mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
+               i2c-parent = <&i2c1>;
+
+               i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       adc0: nau7802@2a {
+                               compatible = "nuvoton,nau7802";
+                               reg = <0x2a>;
+                               nuvoton,vldo = <3000>;
+                       };
+               };
+
+               i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       adc1: nau7802@2a {
+                               compatible = "nuvoton,nau7802";
+                               reg = <0x2a>;
+                               nuvoton,vldo = <3000>;
+                       };
+               };
+
+               i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+
+                               adc2: nau7802@2a {
+                               compatible = "nuvoton,nau7802";
+                               reg = <0x2a>;
+                               nuvoton,vldo = <3000>;
+                       };
+               };
+
+               i2c@3 {
+                       reg = <3>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       pca9555: pca9555@20 {
+                               compatible = "nxp,pca9555";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pca_pins_cfa10049>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <19 0x2>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               reg = <0x20>;
+                       };
+               };
+       };
+
        apb@80000000 {
                apbh@80000000 {
                        pinctrl@80018000 {
@@ -219,71 +284,6 @@
                                status = "okay";
                        };
 
-                       i2cmux {
-                               compatible = "i2c-mux-gpio";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&i2cmux_pins_cfa10049>;
-                               mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
-                               i2c-parent = <&i2c1>;
-
-                               i2c@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       reg = <0>;
-
-                                       adc0: nau7802@2a {
-                                               compatible = "nuvoton,nau7802";
-                                               reg = <0x2a>;
-                                               nuvoton,vldo = <3000>;
-                                       };
-                               };
-
-                               i2c@1 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       reg = <1>;
-
-                                       adc1: nau7802@2a {
-                                               compatible = "nuvoton,nau7802";
-                                               reg = <0x2a>;
-                                               nuvoton,vldo = <3000>;
-                                       };
-                               };
-
-                               i2c@2 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       reg = <2>;
-
-                                       adc2: nau7802@2a {
-                                               compatible = "nuvoton,nau7802";
-                                               reg = <0x2a>;
-                                               nuvoton,vldo = <3000>;
-                                       };
-                               };
-
-                               i2c@3 {
-                                       reg = <3>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       pca9555: pca9555@20 {
-                                               compatible = "nxp,pca9555";
-                                               pinctrl-names = "default";
-                                               pinctrl-0 = <&pca_pins_cfa10049>;
-                                               interrupt-parent = <&gpio2>;
-                                               interrupts = <19 0x2>;
-                                               gpio-controller;
-                                               #gpio-cells = <2>;
-                                               interrupt-controller;
-                                               #interrupt-cells = <2>;
-                                               reg = <0x20>;
-                                       };
-                               };
-                       };
-
                        usbphy1: usbphy@8007e000 {
                                status = "okay";
                        };