arm64: zynqmp: Use i2c-mux instead of i2cswitch instead

Based on review from mainline i2c-mux is standard name for i2c switches.

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

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 09fd41a1782a03a552ee54257326eb91d856fafe..44c3fcdea112206e28849689456819153cb8c375 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -180,7 +180,7 @@
        scl-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
        sda-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
        clock-frequency = <100000>;
-       i2cswitch@75 { /* u11 */
+       i2c-mux@75 { /* u11 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts
index dbaac91de06dcae48785a38707352214515c65a3..1ccf8b564d2fc3f774ab96701a9ec2c5de80b551 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revA.dts
@@ -221,7 +221,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u60 */
+       i2c-mux@75 { /* u60 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -413,7 +413,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751)  += max20751.o
 
        /* FIXME PL i2c via PCA9306 - u45 */
        /* FIXME MSP430 - u41 - not detected */
-       i2cswitch@74 { /* u34 */
+       i2c-mux@74 { /* u34 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -488,7 +488,7 @@ drivers/hwmon/pmbus/Makefile:11:obj-$(CONFIG_SENSORS_MAX20751)  += max20751.o
                /* 5 - 7 unconnected */
        };
 
-       i2cswitch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548"; /* u135 */
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-zcu102-revB.dts b/arch/arm/dts/zynqmp-zcu102-revB.dts
index 7b68a0f9e0ab1542f07830ce47cacbf9dfae4794..9024d9e84fc01470c3f4d8f9d8fe77d93e50ec46 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu102-revB.dts
+++ b/arch/arm/dts/zynqmp-zcu102-revB.dts
@@ -32,7 +32,7 @@
 
 /* Fix collision with u61 */
 &i2c0 {
-       i2cswitch@75 {
+       i2c-mux@75 {
                i2c@2 {
                        max15303@1b { /* u8 */
                                compatible = "max15303";

diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts
index b949d41c097b8eb67990ac9166a7bd15a0e14b0b..455a01e2b7955f639799f958c78d1abcc9844687 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revA.dts
@@ -87,7 +87,7 @@
        sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 
        /* Another connection to this bus via PL i2c via PCA9306 - u45 */
-       i2cswitch@74 { /* u34 */
+       i2c-mux@74 { /* u34 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index 07ab0c24d9884fb05a48bbf8ad2639d02ae5c615..674ed53f5ac005af9f359b9aa47960e97af8087c 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -106,7 +106,7 @@
        };
 
        /* Another connection to this bus via PL i2c via PCA9306 - u45 */
-       i2cswitch@74 { /* u34 */
+       i2c-mux@74 { /* u34 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts
index 20f7fdddfbcaa8480ec770dbfab1deed405a5944..d8a00d7b3c21e11c11c62d9aacc77ad3ab3260f0 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu106-revA.dts
@@ -195,7 +195,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u60 */
+       i2c-mux@75 { /* u60 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -383,7 +383,7 @@
 
        /* FIXME PL i2c via PCA9306 - u45 */
        /* FIXME MSP430 - u41 - not detected */
-       i2cswitch@74 { /* u34 */
+       i2c-mux@74 { /* u34 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -462,7 +462,7 @@
                /* 6 - 7 unconnected */
        };
 
-       i2cswitch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548"; /* u135 */
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 60fc6fd43c4e41f599f0d3e9726fc0b8f3aad39a..65914f6c98f337d24a104c015740956641234cbb 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -162,7 +162,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u23 */
+       i2c-mux@75 { /* u23 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -294,7 +294,7 @@
        scl-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
        sda-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 
-       i2cswitch@74 { /* u26 */
+       i2c-mux@74 { /* u26 */
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -387,7 +387,7 @@
                /* 7 NC */
        };
 
-       i2cswitch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548"; /* u27 */
                #address-cells = <1>;
                #size-cells = <0>;