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/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
index 1763985eafd93a0c59cd5be227546928e5b98387..47604708dca4b8d240d37d35bedda5467222d06f 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
@@ -179,7 +179,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/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
index 7016b3d7dc6a2608682e4d265f4cedf961896644..892364a76b1983a5306753f3e557bc16b8ae4fa5 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
@@ -220,7 +220,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u60 */
+       i2c-mux@75 { /* u60 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -412,7 +412,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>;
@@ -487,7 +487,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/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
index 216a6b7f0adb5b9aff180d92487ca0db03c8e596..27f4e4d041889557981893a5308a956fb79cd960 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
@@ -31,7 +31,7 @@
 
 /* Fix collision with u61 */
 &i2c0 {
-       i2cswitch@75 {
+       i2c-mux@75 {
                i2c@2 {
                        max15303@1b { /* u8 */
                                compatible = "max15303";

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
index 97bcd69e2f58d483062ee1310bf559f5708436c4..90699a9e199708ec1d3cff36723669ef89f999ae 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
@@ -86,7 +86,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/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
index cfc5be413b7403633acc0fbed1bc6e257f63de1d..7d7af9f1f194893cf1ea1153a5f34cb10f7b3a73 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts
@@ -105,7 +105,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/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
index a764e47c7d743ace74c46cb1bcac788bab242d7f..91315d8fca7cf981c74c9a30af018e73b53a71c5 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
@@ -194,7 +194,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u60 */
+       i2c-mux@75 { /* u60 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -382,7 +382,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>;
@@ -461,7 +461,7 @@
                /* 6 - 7 unconnected */
        };
 
-       i2cswitch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548"; /* u135 */
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
index e8fca16510237401aafad91e5890b6cb84d265b9..b3bee19e12d35be0b4c594197bcd9f3cbd96c1b0 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
@@ -161,7 +161,7 @@
                 */
        };
 
-       i2cswitch@75 { /* u23 */
+       i2c-mux@75 { /* u23 */
                compatible = "nxp,pca9544";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -293,7 +293,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>;
@@ -386,7 +386,7 @@
                /* 7 NC */
        };
 
-       i2cswitch@75 {
+       i2c-mux@75 {
                compatible = "nxp,pca9548"; /* u27 */
                #address-cells = <1>;
                #size-cells = <0>;