From: Ricky CX Wu <ricky.cx.wu.wiwynn@xxxxxxxxx> Change the address of the I2C mux for two fan boards to 0x74 according to schematic. Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@xxxxxxxxx> Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@xxxxxxxxxx> --- .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 81 ++++++++++--------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts index 98477792aa00..04f6378c2b5f 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts @@ -17,6 +17,9 @@ aliases { serial6 = &uart7; serial7 = &uart8; serial8 = &uart9; + + i2c30 = &imux30; + i2c31 = &imux31; }; chosen { @@ -380,6 +383,8 @@ ipmb@10 { }; &i2c14 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; bus-frequency = <400000>; adc@1d { @@ -440,20 +445,50 @@ eeprom@51 { reg = <0x51>; }; - i2c-mux@71 { - compatible = "nxp,pca9846"; + i2c-mux@73 { + compatible = "nxp,pca9544"; #address-cells = <1>; #size-cells = <0>; idle-state = <0>; i2c-mux-idle-disconnect; - reg = <0x71>; + reg = <0x73>; i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; + adc@35 { + compatible = "maxim,max11617"; + reg = <0x35>; + }; + }; + + i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + adc@35 { + compatible = "maxim,max11617"; + reg = <0x35>; + }; + }; + }; + + i2c-mux@74 { + compatible = "nxp,pca9546"; + reg = <0x74>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + imux30: i2c@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + adc@1f { compatible = "ti,adc128d818"; reg = <0x1f>; @@ -470,6 +505,8 @@ pwm@20{ gpio@22{ compatible = "ti,tca6424"; reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; }; pwm@23{ @@ -499,10 +536,10 @@ gpio@61 { }; }; - i2c@1 { + imux31: i2c@1 { + reg = <1>; #address-cells = <1>; #size-cells = <0>; - reg = <0>; adc@1f { compatible = "ti,adc128d818"; @@ -520,6 +557,8 @@ pwm@20{ gpio@22{ compatible = "ti,tca6424"; reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; }; pwm@23{ @@ -549,38 +588,6 @@ gpio@61 { }; }; }; - - i2c-mux@73 { - compatible = "nxp,pca9544"; - #address-cells = <1>; - #size-cells = <0>; - - idle-state = <0>; - i2c-mux-idle-disconnect; - reg = <0x73>; - - i2c@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - - adc@35 { - compatible = "maxim,max11617"; - reg = <0x35>; - }; - }; - - i2c@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - - adc@35 { - compatible = "maxim,max11617"; - reg = <0x35>; - }; - }; - }; }; &i2c15 { -- 2.25.1