ARM: dts: aspeed: Rainier: Update to pass 2 hardware

Add the muxes present in pass 2 and remove the eeproms that were
removed.

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

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index b13bd7e..941c048 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -50,6 +50,17 @@
                i2c17 = &i2c2mux1;
                i2c18 = &i2c2mux2;
                i2c19 = &i2c2mux3;
+               i2c20 = &i2c4mux0chn0;
+               i2c21 = &i2c4mux0chn1;
+               i2c22 = &i2c4mux0chn2;
+               i2c23 = &i2c5mux0chn0;
+               i2c24 = &i2c5mux0chn1;
+               i2c25 = &i2c6mux0chn0;
+               i2c26 = &i2c6mux0chn1;
+               i2c27 = &i2c6mux0chn2;
+               i2c28 = &i2c6mux0chn3;
+               i2c29 = &i2c11mux0chn0;
+               i2c30 = &i2c11mux0chn1;
 
                spi10 = &cfam0_spi0;
                spi11 = &cfam0_spi1;
@@ -1118,19 +1129,46 @@
                reg = <0x4a>;
        };
 
-       eeprom@50 {
-               compatible = "atmel,24c64";
-               reg = <0x50>;
-       };
+       pca9546@70 {
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "okay";
+               i2c-mux-idle-disconnect;
 
-       eeprom@51 {
-               compatible = "atmel,24c64";
-               reg = <0x51>;
-       };
+               i2c4mux0chn0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
 
-       eeprom@52 {
-               compatible = "atmel,24c64";
-               reg = <0x52>;
+                       eeprom@50 {
+                               compatible = "atmel,24c64";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c4mux0chn1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       eeprom@51 {
+                               compatible = "atmel,24c64";
+                               reg = <0x51>;
+                       };
+               };
+
+               i2c4mux0chn2: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+
+                       eeprom@52 {
+                               compatible = "atmel,24c64";
+                               reg = <0x52>;
+                       };
+               };
        };
 };
 
@@ -1147,14 +1185,35 @@
                reg = <0x49>;
        };
 
-       eeprom@50 {
-               compatible = "atmel,24c64";
-               reg = <0x50>;
-       };
+       pca9546@70 {
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "okay";
+               i2c-mux-idle-disconnect;
 
-       eeprom@51 {
-               compatible = "atmel,24c64";
-               reg = <0x51>;
+               i2c5mux0chn0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c64";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c5mux0chn1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       eeprom@51 {
+                               compatible = "atmel,24c64";
+                               reg = <0x51>;
+                       };
+               };
        };
 };
 
@@ -1176,24 +1235,57 @@
                reg = <0x4b>;
        };
 
-       eeprom@50 {
-               compatible = "atmel,24c64";
-               reg = <0x50>;
-       };
+       pca9546@70 {
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "okay";
+               i2c-mux-idle-disconnect;
 
-       eeprom@51 {
-               compatible = "atmel,24c64";
-               reg = <0x51>;
-       };
+               i2c6mux0chn0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
 
-       eeprom@52 {
-               compatible = "atmel,24c64";
-               reg = <0x52>;
-       };
+                       eeprom@53 {
+                               compatible = "atmel,24c64";
+                               reg = <0x53>;
+                       };
+               };
 
-       eeprom@53 {
-               compatible = "atmel,24c64";
-               reg = <0x53>;
+               i2c6mux0chn1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       eeprom@52 {
+                               compatible = "atmel,24c64";
+                               reg = <0x52>;
+                       };
+               };
+
+               i2c6mux0chn2: i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c64";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c6mux0chn3: i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+
+                       eeprom@51 {
+                               compatible = "atmel,24c64";
+                               reg = <0x51>;
+                       };
+               };
        };
 };
 
@@ -1550,14 +1642,35 @@
                reg = <0x49>;
        };
 
-       eeprom@50 {
-               compatible = "atmel,24c64";
-               reg = <0x50>;
-       };
+       pca9546@70 {
+               compatible = "nxp,pca9546";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "okay";
+               i2c-mux-idle-disconnect;
 
-       eeprom@51 {
-               compatible = "atmel,24c64";
-               reg = <0x51>;
+               i2c11mux0chn0: i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c64";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c11mux0chn1: i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       eeprom@51 {
+                               compatible = "atmel,24c64";
+                               reg = <0x51>;
+                       };
+               };
        };
 };