ARM: dts: aspeed: Fix pca954x i2c-mux node names

"make dtbs_check":

    arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dtb: i2c-switch@70: $nodename:0: 'i2c-switch@70' does not match '^(i2c-?)?mux'
	    From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
    arm/boot/dts/aspeed-bmc-bytedance-g220a.dtb: i2c-switch@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3' were unexpected)
	    From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
    ...

Fix this by renaming PCA954x nodes to "i2c-mux", to match the I2C bus
multiplexer/switch DT bindings and the Generic Names Recommendation in
the Devicetree Specification.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
index f75cad4..3f03a19 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts
@@ -424,7 +424,7 @@
 
 &i2c3 {
        status = "okay";
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -471,7 +471,7 @@
 
 &i2c6 {
        status = "okay";
-       i2c-switch@72 {
+       i2c-mux@72 {
                compatible = "nxp,pca9548";
                reg = <0x72>;
                #address-cells = <1>;
@@ -524,7 +524,7 @@
                };
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -533,7 +533,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0>;
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9546";
                                reg = <0x71>;
                                #address-cells = <1>;
@@ -569,7 +569,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <1>;
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9546";
                                reg = <0x71>;
                                #address-cells = <1>;
@@ -605,7 +605,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <2>;
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9546";
                                reg = <0x71>;
                                #address-cells = <1>;
@@ -640,7 +640,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <3>;
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9546";
                                reg = <0x71>;
                                #address-cells = <1>;
@@ -808,7 +808,7 @@
 
 &i2c10 {
        status = "okay";
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -838,7 +838,7 @@
                };
        };
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9546";
                reg = <0x71>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
index 5cd0600..d49328f 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
@@ -132,7 +132,7 @@
         * PCA9548 (1-0070) provides 8 channels connecting to SMB (Switch
         * Main Board).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -194,7 +194,7 @@
         * PCA9548 (2-0070) provides 8 channels connecting to SCM (System
         * Controller Module).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -256,7 +256,7 @@
         * PCA9548 (3-0070) provides 8 channels connecting to SMB (Switch
         * Main Board).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -423,7 +423,7 @@
         * PCA9548 (8-0070) provides 8 channels connecting to PDB (Power
         * Delivery Board).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -486,7 +486,7 @@
         * PCA9548 (15-0076) provides 8 channels connecting to FCM (Fan
         * Controller Module).
         */
-       i2c-switch@76 {
+       i2c-mux@76 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts
index 90a3f48..2415386 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts
@@ -328,7 +328,7 @@
 &i2c1 {
        status = "okay";
 
-       i2c-switch@77 {
+       i2c-mux@77 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -341,7 +341,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -390,7 +390,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -446,7 +446,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -495,7 +495,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -551,7 +551,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -600,7 +600,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -656,7 +656,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -705,7 +705,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -761,7 +761,7 @@
                        #size-cells = <0>;
                        reg = <4>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -810,7 +810,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -866,7 +866,7 @@
                        #size-cells = <0>;
                        reg = <5>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -915,7 +915,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -971,7 +971,7 @@
                        #size-cells = <0>;
                        reg = <6>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1020,7 +1020,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1076,7 +1076,7 @@
                        #size-cells = <0>;
                        reg = <7>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1125,7 +1125,7 @@
                                };
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1183,7 +1183,7 @@
 &i2c2 {
        status = "okay";
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -1281,7 +1281,7 @@
 &i2c8 {
        status = "okay";
 
-       i2c-switch@77 {
+       i2c-mux@77 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -1294,7 +1294,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1350,7 +1350,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1406,7 +1406,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1462,7 +1462,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@70 {
+                       i2c-mux@70 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
index b5cd4c7..74f3c67 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
@@ -65,7 +65,7 @@
 };
 
 &i2c2 {
-       i2c-switch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -123,7 +123,7 @@
 };
 
 &i2c5 {
-       i2c-switch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
index 6b319f3..f23c26a 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
@@ -233,7 +233,7 @@
         * PCA9548 (2-0070) provides 8 channels connecting to SCM (System
         * Controller Module).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -303,7 +303,7 @@
         * PCA9548 (8-0070) provides 8 channels connecting to SMB (Switch
         * Main Board).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -315,7 +315,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -481,7 +481,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@72 {
+                       i2c-mux@72 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -544,7 +544,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -615,7 +615,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -715,7 +715,7 @@
         * PCA9548 (11-0077) provides 8 channels connecting to SMB (Switch
         * Main Board).
         */
-       i2c-switch@77 {
+       i2c-mux@77 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -727,7 +727,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -790,7 +790,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -853,7 +853,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -916,7 +916,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -979,7 +979,7 @@
                        #size-cells = <0>;
                        reg = <4>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1042,7 +1042,7 @@
                        #size-cells = <0>;
                        reg = <5>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1105,7 +1105,7 @@
                        #size-cells = <0>;
                        reg = <6>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1168,7 +1168,7 @@
                        #size-cells = <0>;
                        reg = <7>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts
index 230d16c..aafd104 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minipack.dts
@@ -344,7 +344,7 @@
         * I2C Switch 2-0070 is connecting to SCM (System Controller
         * Module).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -425,7 +425,7 @@
 &i2c8 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -441,7 +441,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@71 {
+                       i2c-mux@71 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -507,7 +507,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@72 {
+                       i2c-mux@72 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -573,7 +573,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -639,7 +639,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@76 {
+                       i2c-mux@76 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -729,7 +729,7 @@
         * I2C Switch 9-0070 is connecting to MAC/PHY EEPROMs on SMB
         * (Switch Main Board).
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -793,7 +793,7 @@
 &i2c11 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -809,7 +809,7 @@
                        #size-cells = <0>;
                        reg = <0>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -875,7 +875,7 @@
                        #size-cells = <0>;
                        reg = <1>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -941,7 +941,7 @@
                        #size-cells = <0>;
                        reg = <2>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1007,7 +1007,7 @@
                        #size-cells = <0>;
                        reg = <3>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1073,7 +1073,7 @@
                        #size-cells = <0>;
                        reg = <4>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1139,7 +1139,7 @@
                        #size-cells = <0>;
                        reg = <5>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1205,7 +1205,7 @@
                        #size-cells = <0>;
                        reg = <6>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -1271,7 +1271,7 @@
                        #size-cells = <0>;
                        reg = <7>;
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9548";
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
index b6b1635..704ee68 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
@@ -211,7 +211,7 @@
 &i2c1 {
        status = "okay";
        //X24 Riser
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -243,7 +243,7 @@
                                pagesize = <32>;
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9546";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -303,7 +303,7 @@
                                pagesize = <32>;
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9546";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -363,7 +363,7 @@
                                pagesize = <32>;
                        };
 
-                       i2c-switch@73 {
+                       i2c-mux@73 {
                                compatible = "nxp,pca9546";
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts
index 584efa5..97cd11c 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge100.dts
@@ -44,7 +44,7 @@
 };
 
 &i2c7 {
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
index d17b977..a677c82 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts
@@ -139,7 +139,7 @@
 &i2c2 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -219,7 +219,7 @@
 &i2c8 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -288,7 +288,7 @@
 &i2c11 {
        status = "okay";
 
-       i2c-switch@76 {
+       i2c-mux@76 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts
index 5e61058..98fe0d6 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts
@@ -57,7 +57,7 @@
 &i2c2 {
        status = "okay";
 
-       i2c-switch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 1f59ab2..214b2e6 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -417,7 +417,7 @@
                        "expander-cable-card5";
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -562,7 +562,7 @@
                        "expander-cable-card11";
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -719,7 +719,7 @@
 &i2c6 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -1810,7 +1810,7 @@
                reg = <0x50>;
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -1947,7 +1947,7 @@
                reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -2206,7 +2206,7 @@
                };
        };
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9546";
                reg = <0x71>;
                #address-cells = <1>;
@@ -2259,7 +2259,7 @@
 &i2c15 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -2311,7 +2311,7 @@
                };
        };
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9546";
                reg = <0x71>;
                #address-cells = <1>;
@@ -2363,7 +2363,7 @@
                };
        };
 
-       i2c-switch@72 {
+       i2c-mux@72 {
                compatible = "nxp,pca9546";
                reg = <0x72>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
index 2566d26..5cb0094 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
@@ -341,7 +341,7 @@
                reg = <0x4a>;
        };
 
-       pca9546@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -423,7 +423,7 @@
                reg = <0x49>;
        };
 
-       pca9546@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -525,7 +525,7 @@
                reg = <0x4b>;
        };
 
-       pca9546@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -1355,7 +1355,7 @@
                reg = <0x49>;
        };
 
-       pca9546@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
index 208b0f0..0dea014 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts
@@ -348,7 +348,7 @@
                label = "outlet";
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -432,7 +432,7 @@
 &i2c7 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts
index b3c1e3b..92b9b39 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts
@@ -215,7 +215,7 @@
                label = "outlet";
        };
 
-       pca9548@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                reg = <0x70>;
        };
@@ -224,17 +224,17 @@
 &i2c3 {
        status = "okay";
 
-       pca9548@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                reg = <0x70>;
        };
 
-       pca9548@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9548";
                reg = <0x71>;
        };
 
-       pca9548@72 {
+       i2c-mux@72 {
                compatible = "nxp,pca9548";
                reg = <0x72>;
        };
@@ -248,7 +248,7 @@
 &i2c5 {
        status = "okay";
 
-       pca9548@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                reg = <0x70>;
        };
@@ -257,7 +257,7 @@
 &i2c6 {
        status = "okay";
 
-       pca9548@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                reg = <0x70>;
        };

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-transformers.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-transformers.dts
index caf6665..c713cb7 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-transformers.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-transformers.dts
@@ -193,14 +193,14 @@
        // I2C EXPANDER
        status = "okay";
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x71>;
        };
 
-       i2c-switch@73 {
+       i2c-mux@73 {
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -212,7 +212,7 @@
        // I2C EXPANDER
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
index 8f543cc..ddbcbc6 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts
@@ -208,7 +208,7 @@
         *      Slot 3
         */
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9545";
                reg = <0x70>;
                #address-cells = <1>;
@@ -249,7 +249,7 @@
         *      Slot 2,
         *      Slot 3
         */
-       i2c-switch@76 {
+       i2c-mux@76 {
                compatible = "nxp,pca9546";
                reg = <0x76>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
index bcc1820..6045b60 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
@@ -175,7 +175,7 @@
 &i2c0 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9545";
                reg = <0x70>;
                #address-cells = <1>;
@@ -227,7 +227,7 @@
 
 &i2c3 {
        status = "okay";
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
index 0cb7b20..3d2d8db 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
@@ -231,7 +231,7 @@
 &i2c1 {
        status = "okay";
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9546";
                reg = <0x71>;
                #address-cells = <1>;
@@ -282,7 +282,7 @@
 &i2c4 {
        status = "okay";
 
-       i2c-switch@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9546";
                reg = <0x71>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts
index 9605e53..fed2791 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts
@@ -197,7 +197,7 @@
         *    Slot 6,
         *    Slot 7
         */
-       i2c-switch@74 {
+       i2c-mux@74 {
                compatible = "nxp,pca9546";
                reg = <0x74>;
                #address-cells = <1>;
@@ -238,7 +238,7 @@
         *    SSD 1,
         *    SSD 2
         */
-       i2c-switch@77 {
+       i2c-mux@77 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -325,7 +325,7 @@
         *    PSU3
         *    PSU2
         */
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
index 46cbba6..983853e 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
@@ -285,7 +285,7 @@
                reg = <0x4b>;
        };
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
                #address-cells = <1>;
@@ -321,7 +321,7 @@
 &i2c1 {
        status = "okay";
 
-       i2c-switch@59 {
+       i2c-mux@59 {
                compatible = "nxp,pca9848";
                reg = <0x59>;
                #address-cells = <1>;
@@ -393,7 +393,7 @@
                        #size-cells = <0>;
                        reg = <7>;
 
-                       i2c-switch@77 {
+                       i2c-mux@77 {
                                compatible = "nxp,pca9546";
                                reg = <0x77>;
                                #address-cells = <1>;
@@ -490,7 +490,7 @@
 &i2c6 {
        status = "okay";
 
-       i2c-switch@77 {
+       i2c-mux@77 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -556,7 +556,7 @@
 &i2c7 {
        status = "okay";
 
-       i2c-switch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9546";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts
index 2431926..44b9853 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts
@@ -88,16 +88,16 @@
 
 &i2c13 {
        /* SMB_PCIE2_STBY_LVC3 */
-       mux-expa@73 {
-               compatible = "nxp,pca9545";
-               reg = <0x73>;
+       i2c-mux@71 {
+               compatible = "nxp,pca9543";
+               reg = <0x71>;
                #address-cells = <1>;
                #size-cells = <0>;
                i2c-mux-idle-disconnect;
        };
-       mux-sata@71 {
-               compatible = "nxp,pca9543";
-               reg = <0x71>;
+       i2c-mux@73 {
+               compatible = "nxp,pca9545";
+               reg = <0x73>;
                #address-cells = <1>;
                #size-cells = <0>;
                i2c-mux-idle-disconnect;
@@ -106,7 +106,7 @@
 
 &i2c2 {
        /* SMB_PCIE_STBY_LVC3 */
-       mux-expb@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9545";
                reg = <0x71>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts
index ebbb68b..b8f0b08 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts
@@ -133,7 +133,7 @@
 
 &i2c13 {
        /* SMB_PCIE2_STBY_LVC3 */
-       mux-expa@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                reg = <0x70>;
                #address-cells = <1>;
@@ -144,7 +144,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <2>;
-                       rsra-mux@72 {
+                       i2c-mux@72 {
                                compatible = "nxp,pca9548";
                                reg = <0x72>;
                                #address-cells = <1>;
@@ -165,7 +165,7 @@
                        };
                };
        };
-       mux-sata@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9543";
                reg = <0x71>;
                #address-cells = <1>;
@@ -176,7 +176,7 @@
 
 &i2c2 {
        /* SMB_PCIE_STBY_LVC3 */
-       mux-expb@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9548";
                reg = <0x71>;
                #address-cells = <1>;
@@ -187,7 +187,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0>;
-                       rsrb-mux@72 {
+                       i2c-mux@72 {
                                compatible = "nxp,pca9548";
                                reg = <0x72>;
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts
index e36ee47..933ca83 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts
@@ -88,16 +88,16 @@
 
 &i2c13 {
        /* SMB_PCIE2_STBY_LVC3 */
-       mux-expa@73 {
-               compatible = "nxp,pca9545";
-               reg = <0x73>;
+       i2c-mux@71 {
+               compatible = "nxp,pca9543";
+               reg = <0x71>;
                #address-cells = <1>;
                #size-cells = <0>;
                i2c-mux-idle-disconnect;
        };
-       mux-sata@71 {
-               compatible = "nxp,pca9543";
-               reg = <0x71>;
+       i2c-mux@73 {
+               compatible = "nxp,pca9545";
+               reg = <0x73>;
                #address-cells = <1>;
                #size-cells = <0>;
                i2c-mux-idle-disconnect;
@@ -106,7 +106,7 @@
 
 &i2c2 {
        /* SMB_PCIE_STBY_LVC3 */
-       mux-expb@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9545";
                reg = <0x71>;
                #address-cells = <1>;