From: Eddie James <eajames@linux.ibm.com>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 1/4] ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8
Date: Tue, 13 Apr 2021 14:43:05 -0500 [thread overview]
Message-ID: <20210413194308.36930-2-eajames@linux.ibm.com> (raw)
In-Reply-To: <20210413194308.36930-1-eajames@linux.ibm.com>
The second presence detection PCA9552 was incorrectly added to bus 9.
Fixes: 8be44de6f209 ("ARM: dts: aspeed: Rainier: Add presence GPIOs")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 109 ++-----------------
1 file changed, 10 insertions(+), 99 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 4dbb030f3ebb..49419cd7f853 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1399,7 +1399,7 @@ eeprom at 51 {
reg = <0x51>;
};
- pca1: pca9552 at 61 {
+ pca_pres2: pca9552 at 61 {
compatible = "nxp,pca9552";
reg = <0x61>;
#address-cells = <1>;
@@ -1407,6 +1407,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 = <PCA955X_TYPE_GPIO>;
@@ -1507,104 +1516,6 @@ eeprom at 50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
-
- pca_pres3: pca9552 at 61 {
- compatible = "nxp,pca9552";
- reg = <0x61>;
- #address-cells = <1>;
- #size-cells = <0>;
- 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 = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 1 {
- reg = <1>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 2 {
- reg = <2>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 3 {
- reg = <3>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 4 {
- reg = <4>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 5 {
- reg = <5>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 6 {
- reg = <6>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 7 {
- reg = <7>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 8 {
- reg = <8>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 9 {
- reg = <9>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 10 {
- reg = <10>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 11 {
- reg = <11>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 12 {
- reg = <12>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 13 {
- reg = <13>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 14 {
- reg = <14>;
- type = <PCA955X_TYPE_GPIO>;
- };
-
- gpio at 15 {
- reg = <15>;
- type = <PCA955X_TYPE_GPIO>;
- };
- };
};
&i2c10 {
--
2.27.0
next prev parent reply other threads:[~2021-04-13 19:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 19:43 [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Eddie James
2021-04-13 19:43 ` Eddie James [this message]
2021-04-13 19:43 ` [PATCH 2/4] ARM: dts: aspeed: Rainier: Fix humidity sensor bus address Eddie James
2021-04-13 19:43 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes Eddie James
2021-04-13 19:43 ` [PATCH 4/4] ARM: dts: aspeed: Rainier: Update to pass 2 hardware Eddie James
2021-04-16 2:47 ` [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Joel Stanley
2021-04-16 2:48 ` Joel Stanley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210413194308.36930-2-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=linux-aspeed@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).