| Message ID | 20240613152425.1582059-8-peteryin.openbmc@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Revise Meta(Facebook) Harma BMC(AST2600) | expand |
Hi Peter, On Thu, 2024-06-13 at 23:24 +0800, Peter Yin wrote: > remove pca9546 and add Aegis fru device Is there some relationship between these two things? Can you elaborate? You also add a couple of GPIO expanders that aren't mentioned here? Andrew > > Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com> > --- > .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 56 +++++++++---------- > 1 file changed, 25 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts > index d892e646fced..4ff9e0104bbe 100644 > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts > @@ -20,10 +20,6 @@ aliases { > i2c21 = &imux21; > i2c22 = &imux22; > i2c23 = &imux23; > - i2c24 = &imux24; > - i2c25 = &imux25; > - i2c26 = &imux26; > - i2c27 = &imux27; > i2c28 = &imux28; > i2c29 = &imux29; > i2c30 = &imux30; > @@ -391,33 +387,6 @@ gpio@31 { > "","","",""; > }; > > - i2c-mux@71 { > - compatible = "nxp,pca9546"; > - reg = <0x71>; > - #address-cells = <1>; > - #size-cells = <0>; > - > - imux24: i2c@0 { > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <0>; > - }; > - imux25: i2c@1 { > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <1>; > - }; > - imux26: i2c@2 { > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <2>; > - }; > - imux27: i2c@3 { > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <3>; > - }; > - }; > // PTTV FRU > eeprom@52 { > compatible = "atmel,24c64"; > @@ -427,6 +396,31 @@ eeprom@52 { > > &i2c11 { > status = "okay"; > + > + gpio@30 { > + compatible = "nxp,pca9555"; > + reg = <0x30>; > + gpio-controller; > + #gpio-cells = <2>; > + }; > + gpio@31 { > + compatible = "nxp,pca9555"; > + reg = <0x31>; > + gpio-controller; > + #gpio-cells = <2>; > + > + gpio-line-names = > + "","","","", > + "","","presence-cmm","", > + "","","","", > + "","","",""; > + }; > + > + // Aegis FRU > + eeprom@52 { > + compatible = "atmel,24c64"; > + reg = <0x52>; > + }; > }; > > &i2c12 {
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts index d892e646fced..4ff9e0104bbe 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts @@ -20,10 +20,6 @@ aliases { i2c21 = &imux21; i2c22 = &imux22; i2c23 = &imux23; - i2c24 = &imux24; - i2c25 = &imux25; - i2c26 = &imux26; - i2c27 = &imux27; i2c28 = &imux28; i2c29 = &imux29; i2c30 = &imux30; @@ -391,33 +387,6 @@ gpio@31 { "","","",""; }; - i2c-mux@71 { - compatible = "nxp,pca9546"; - reg = <0x71>; - #address-cells = <1>; - #size-cells = <0>; - - imux24: i2c@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - }; - imux25: i2c@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - }; - imux26: i2c@2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <2>; - }; - imux27: i2c@3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <3>; - }; - }; // PTTV FRU eeprom@52 { compatible = "atmel,24c64"; @@ -427,6 +396,31 @@ eeprom@52 { &i2c11 { status = "okay"; + + gpio@30 { + compatible = "nxp,pca9555"; + reg = <0x30>; + gpio-controller; + #gpio-cells = <2>; + }; + gpio@31 { + compatible = "nxp,pca9555"; + reg = <0x31>; + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = + "","","","", + "","","presence-cmm","", + "","","","", + "","","",""; + }; + + // Aegis FRU + eeprom@52 { + compatible = "atmel,24c64"; + reg = <0x52>; + }; }; &i2c12 {
remove pca9546 and add Aegis fru device Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com> --- .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 56 +++++++++---------- 1 file changed, 25 insertions(+), 31 deletions(-)