From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eddie James Date: Mon, 29 Mar 2021 10:00:07 -0500 Subject: [PATCH 09/22] ARM: dts: aspeed: rainier: Add presence GPIOs In-Reply-To: <20210329150020.13632-1-eajames@linux.ibm.com> References: <20210329150020.13632-1-eajames@linux.ibm.com> Message-ID: <20210329150020.13632-10-eajames@linux.ibm.com> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Alpana Kumari This commit adds presence detect GPIO chips for various FRUs on Rainier. Also, correct the I2C address for the tca9554. Signed-off-by: Alpana Kumari Signed-off-by: Eddie James --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 169 ++++++++++++++++++- 1 file changed, 160 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts index 78238ffc8997..1d66dc995797 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts @@ -1538,20 +1538,64 @@ eeprom at 51 { reg = <0x51>; }; - tca9554 at 40 { + tca_pres1: tca9554 at 20{ compatible = "ti,tca9554"; - reg = <0x40>; + reg = <0x20>; + #address-cells = <1>; + #size-cells = <0>; + gpio-controller; #gpio-cells = <2>; - smbus0-hog { - gpio-hog; - gpios = <4 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "smbus0"; + gpio-line-names = "", + "RUSSEL_FW_I2C_ENABLE_N", + "RUSSEL_OPPANEL_PRESENCE_N", + "BLYTH_OPPANEL_PRESENCE_N", + "CPU_TPM_CARD_PRESENT_N", + "DASD_BP2_PRESENT_N", + "DASD_BP1_PRESENT_N", + "DASD_BP0_PRESENT_N"; + + gpio at 0 { + reg = <0>; + type = ; + }; + + gpio at 1 { + reg = <1>; + type = ; + }; + + gpio at 2 { + reg = <2>; + type = ; + }; + + gpio at 3 { + reg = <3>; + type = ; + }; + + gpio at 4 { + reg = <4>; + type = ; + }; + + gpio at 5 { + reg = <5>; + type = ; }; - }; + gpio at 6 { + reg = <6>; + type = ; + }; + + gpio at 7 { + reg = <7>; + type = ; + }; + }; }; &i2c1 { @@ -1574,6 +1618,104 @@ power-supply at 69 { compatible = "ibm,cffps"; reg = <0x69>; }; + + pca_pres1: pca9552 at 61 { + compatible = "nxp,pca9552"; + reg = <0x61>; + #address-cells = <1>; + #size-cells = <0>; + + gpio-controller; + #gpio-cells = <2>; + + gpio-line-names = + "SLOT0_PRSNT_EN_RSVD", "SLOT1_PRSNT_EN_RSVD", + "SLOT2_PRSNT_EN_RSVD", "SLOT3_PRSNT_EN_RSVD", + "SLOT4_PRSNT_EN_RSVD", "SLOT0_EXPANDER_PRSNT_N", + "SLOT1_EXPANDER_PRSNT_N", "SLOT2_EXPANDER_PRSNT_N", + "SLOT3_EXPANDER_PRSNT_N", "SLOT4_EXPANDER_PRSNT_N", + "", "", "", "", "", ""; + + gpio at 0 { + reg = <0>; + type = ; + }; + + gpio at 1 { + reg = <1>; + type = ; + }; + + gpio at 2 { + reg = <2>; + type = ; + }; + + gpio at 3 { + reg = <3>; + type = ; + }; + + gpio at 4 { + reg = <4>; + type = ; + }; + + gpio at 5 { + reg = <5>; + type = ; + }; + + gpio at 6 { + reg = <6>; + type = ; + }; + + gpio at 7 { + reg = <7>; + type = ; + }; + + gpio at 8 { + reg = <8>; + type = ; + }; + + gpio at 9 { + reg = <9>; + type = ; + }; + + gpio at 10 { + reg = <10>; + type = ; + }; + + gpio at 11 { + reg = <11>; + type = ; + }; + + gpio at 12 { + reg = <12>; + type = ; + }; + + gpio at 13 { + reg = <13>; + type = ; + }; + + gpio at 14 { + reg = <14>; + type = ; + }; + + gpio at 15 { + reg = <15>; + type = ; + }; + }; }; &i2c4 { @@ -2423,7 +2565,7 @@ eeprom at 51 { reg = <0x51>; }; - pca1: pca9552 at 61 { + pca_pres3: pca9552 at 61 { compatible = "nxp,pca9552"; reg = <0x61>; #address-cells = <1>; @@ -2431,6 +2573,15 @@ pca1: pca9552 at 61 { gpio-controller; #gpio-cells = <2>; + gpio-line-names = + "SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD", + "SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD", + "SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD", + "SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N", + "SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N", + "SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N", + "", "", "", ""; + gpio at 0 { reg = <0>; type = ; -- 2.27.0