ARM: dts: aspeed: Everest: Fix cable card PCA chips

Correct two PCA chips which were placed on the wrong I2C bus and
address.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 3295c8c..27af28c 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -353,10 +353,47 @@
 
 &i2c1 {
        status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
 
-       pca2: pca9552@61 {
+&i2c3 {
+       status = "okay";
+
+       eeprom@54 {
+               compatible = "atmel,24c128";
+               reg = <0x54>;
+       };
+
+       power-supply@68 {
+               compatible = "ibm,cffps";
+               reg = <0x68>;
+       };
+
+       power-supply@69 {
+               compatible = "ibm,cffps";
+               reg = <0x69>;
+       };
+
+       power-supply@6a {
+               compatible = "ibm,cffps";
+               reg = <0x6a>;
+       };
+
+       power-supply@6b {
+               compatible = "ibm,cffps";
+               reg = <0x6b>;
+       };
+};
+
+&i2c4 {
+       status = "okay";
+
+       pca2: pca9552@65 {
                compatible = "nxp,pca9552";
-               reg = <0x61>;
+               reg = <0x65>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -424,12 +461,54 @@
                        reg = <9>;
                        type = <PCA955X_TYPE_GPIO>;
                };
+       };
 
+       i2c-switch@70 {
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "okay";
+               i2c-mux-idle-disconnect;
+
+               i2c4mux0chn0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+                       eeprom@52 {
+                               compatible = "atmel,24c64";
+                               reg = <0x52>;
+                       };
+               };
+
+               i2c4mux0chn1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+                       eeprom@50 {
+                               compatible = "atmel,24c64";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c4mux0chn2: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+                       eeprom@51 {
+                               compatible = "atmel,24c64";
+                               reg = <0x51>;
+                       };
+               };
        };
+};
 
-       pca3: pca9552@62 {
+&i2c5 {
+       status = "okay";
+
+       pca3: pca9552@66 {
                compatible = "nxp,pca9552";
-               reg = <0x62>;
+               reg = <0x66>;
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -512,87 +591,6 @@
 
        };
 
-};
-
-&i2c2 {
-       status = "okay";
-};
-
-&i2c3 {
-       status = "okay";
-
-       eeprom@54 {
-               compatible = "atmel,24c128";
-               reg = <0x54>;
-       };
-
-       power-supply@68 {
-               compatible = "ibm,cffps";
-               reg = <0x68>;
-       };
-
-       power-supply@69 {
-               compatible = "ibm,cffps";
-               reg = <0x69>;
-       };
-
-       power-supply@6a {
-               compatible = "ibm,cffps";
-               reg = <0x6a>;
-       };
-
-       power-supply@6b {
-               compatible = "ibm,cffps";
-               reg = <0x6b>;
-       };
-};
-
-&i2c4 {
-       status = "okay";
-
-       i2c-switch@70 {
-               compatible = "nxp,pca9546";
-               reg = <0x70>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               status = "okay";
-               i2c-mux-idle-disconnect;
-
-               i2c4mux0chn0: i2c@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0>;
-                       eeprom@52 {
-                               compatible = "atmel,24c64";
-                               reg = <0x52>;
-                       };
-               };
-
-               i2c4mux0chn1: i2c@1 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <1>;
-                       eeprom@50 {
-                               compatible = "atmel,24c64";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c4mux0chn2: i2c@2 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <2>;
-                       eeprom@51 {
-                               compatible = "atmel,24c64";
-                               reg = <0x51>;
-                       };
-               };
-       };
-};
-
-&i2c5 {
-       status = "okay";
-
        i2c-switch@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;