From: Peter Yin Date: Thu, 13 Jun 2024 23:24:25 +0800 Subject: [PATCH v1 7/7] ARM: dts: aspeed: Harma: remove pca9546 In-Reply-To: <20240613152425.1582059-1-peteryin.openbmc@gmail.com> References: <20240613152425.1582059-1-peteryin.openbmc@gmail.com> Message-ID: <20240613152425.1582059-8-peteryin.openbmc@gmail.com> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit remove pca9546 and add Aegis fru device Signed-off-by: Peter Yin --- .../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 at 31 { "","","",""; }; - i2c-mux at 71 { - compatible = "nxp,pca9546"; - reg = <0x71>; - #address-cells = <1>; - #size-cells = <0>; - - imux24: i2c at 0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - }; - imux25: i2c at 1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - }; - imux26: i2c at 2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <2>; - }; - imux27: i2c at 3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <3>; - }; - }; // PTTV FRU eeprom at 52 { compatible = "atmel,24c64"; @@ -427,6 +396,31 @@ eeprom at 52 { &i2c11 { status = "okay"; + + gpio at 30 { + compatible = "nxp,pca9555"; + reg = <0x30>; + gpio-controller; + #gpio-cells = <2>; + }; + gpio at 31 { + compatible = "nxp,pca9555"; + reg = <0x31>; + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = + "","","","", + "","","presence-cmm","", + "","","","", + "","","",""; + }; + + // Aegis FRU + eeprom at 52 { + compatible = "atmel,24c64"; + reg = <0x52>; + }; }; &i2c12 { -- 2.25.1