* [PATCH 1/4] ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8
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
2021-04-13 19:43 ` [PATCH 2/4] ARM: dts: aspeed: Rainier: Fix humidity sensor bus address Eddie James
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2021-04-13 19:43 UTC (permalink / raw)
To: linux-aspeed
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/4] ARM: dts: aspeed: Rainier: Fix humidity sensor bus address
2021-04-13 19:43 [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Eddie James
2021-04-13 19:43 ` [PATCH 1/4] ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8 Eddie James
@ 2021-04-13 19:43 ` Eddie James
2021-04-13 19:43 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes Eddie James
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2021-04-13 19:43 UTC (permalink / raw)
To: linux-aspeed
The si7021 was incorrectly placed at 0x20 on i2c bus 7. It is at 0x40.
Fixes: 9c44db7096e0 ("ARM: dts: aspeed: rainier: Add i2c devices")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 49419cd7f853..b13bd7ed18d1 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1201,9 +1201,9 @@ &i2c7 {
multi-master;
status = "okay";
- si7021-a20 at 20 {
+ si7021-a20 at 40 {
compatible = "silabs,si7020";
- reg = <0x20>;
+ reg = <0x40>;
};
tmp275 at 48 {
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes
2021-04-13 19:43 [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Eddie James
2021-04-13 19:43 ` [PATCH 1/4] ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8 Eddie James
2021-04-13 19:43 ` [PATCH 2/4] ARM: dts: aspeed: Rainier: Fix humidity sensor bus address Eddie James
@ 2021-04-13 19:43 ` 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
4 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2021-04-13 19:43 UTC (permalink / raw)
To: linux-aspeed
The 1S4U system populates fans 0, 1, 2, and 4. Update the dts to
reflect this.
Fixes: 7f03894a6555 ("ARM: dts: aspeed: Add Rainier 1S4U machine")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
index d1d31a59e502..f5f5b18c113a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
@@ -9,6 +9,6 @@ / {
};
&max {
- /delete-node/ fan4;
+ /delete-node/ fan3;
/delete-node/ fan5;
};
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/4] ARM: dts: aspeed: Rainier: Update to pass 2 hardware
2021-04-13 19:43 [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Eddie James
` (2 preceding siblings ...)
2021-04-13 19:43 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes Eddie James
@ 2021-04-13 19:43 ` Eddie James
2021-04-16 2:47 ` [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Joel Stanley
4 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2021-04-13 19:43 UTC (permalink / raw)
To: linux-aspeed
Add the muxes present in pass 2 and remove the eeproms that were
removed.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 193 +++++++++++++++----
1 file changed, 153 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index b13bd7ed18d1..941c0489479a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -50,6 +50,17 @@ aliases {
i2c17 = &i2c2mux1;
i2c18 = &i2c2mux2;
i2c19 = &i2c2mux3;
+ i2c20 = &i2c4mux0chn0;
+ i2c21 = &i2c4mux0chn1;
+ i2c22 = &i2c4mux0chn2;
+ i2c23 = &i2c5mux0chn0;
+ i2c24 = &i2c5mux0chn1;
+ i2c25 = &i2c6mux0chn0;
+ i2c26 = &i2c6mux0chn1;
+ i2c27 = &i2c6mux0chn2;
+ i2c28 = &i2c6mux0chn3;
+ i2c29 = &i2c11mux0chn0;
+ i2c30 = &i2c11mux0chn1;
spi10 = &cfam0_spi0;
spi11 = &cfam0_spi1;
@@ -1118,19 +1129,46 @@ tmp275 at 4a {
reg = <0x4a>;
};
- eeprom at 50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- };
+ pca9546 at 70 {
+ compatible = "nxp,pca9546";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ i2c-mux-idle-disconnect;
- eeprom at 51 {
- compatible = "atmel,24c64";
- reg = <0x51>;
- };
+ i2c4mux0chn0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
- eeprom at 52 {
- compatible = "atmel,24c64";
- reg = <0x52>;
+ eeprom at 50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ i2c4mux0chn1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ eeprom at 51 {
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ };
+ };
+
+ i2c4mux0chn2: i2c at 2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+
+ eeprom at 52 {
+ compatible = "atmel,24c64";
+ reg = <0x52>;
+ };
+ };
};
};
@@ -1147,14 +1185,35 @@ tmp275 at 49 {
reg = <0x49>;
};
- eeprom at 50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- };
+ pca9546 at 70 {
+ compatible = "nxp,pca9546";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ i2c-mux-idle-disconnect;
- eeprom at 51 {
- compatible = "atmel,24c64";
- reg = <0x51>;
+ i2c5mux0chn0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ eeprom at 50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ i2c5mux0chn1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ eeprom at 51 {
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ };
+ };
};
};
@@ -1176,24 +1235,57 @@ tmp275 at 4b {
reg = <0x4b>;
};
- eeprom at 50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- };
+ pca9546 at 70 {
+ compatible = "nxp,pca9546";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ i2c-mux-idle-disconnect;
- eeprom at 51 {
- compatible = "atmel,24c64";
- reg = <0x51>;
- };
+ i2c6mux0chn0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
- eeprom at 52 {
- compatible = "atmel,24c64";
- reg = <0x52>;
- };
+ eeprom at 53 {
+ compatible = "atmel,24c64";
+ reg = <0x53>;
+ };
+ };
- eeprom at 53 {
- compatible = "atmel,24c64";
- reg = <0x53>;
+ i2c6mux0chn1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ eeprom at 52 {
+ compatible = "atmel,24c64";
+ reg = <0x52>;
+ };
+ };
+
+ i2c6mux0chn2: i2c at 2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+
+ eeprom at 50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ i2c6mux0chn3: i2c at 3 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <3>;
+
+ eeprom at 51 {
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ };
+ };
};
};
@@ -1550,14 +1642,35 @@ tmp275 at 49 {
reg = <0x49>;
};
- eeprom at 50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- };
+ pca9546 at 70 {
+ compatible = "nxp,pca9546";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ i2c-mux-idle-disconnect;
- eeprom at 51 {
- compatible = "atmel,24c64";
- reg = <0x51>;
+ i2c11mux0chn0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+
+ eeprom at 50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ i2c11mux0chn1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+
+ eeprom at 51 {
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ };
+ };
};
};
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update
2021-04-13 19:43 [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update Eddie James
` (3 preceding siblings ...)
2021-04-13 19:43 ` [PATCH 4/4] ARM: dts: aspeed: Rainier: Update to pass 2 hardware Eddie James
@ 2021-04-16 2:47 ` Joel Stanley
2021-04-16 2:48 ` Joel Stanley
4 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2021-04-16 2:47 UTC (permalink / raw)
To: linux-aspeed
On Tue, 13 Apr 2021 at 19:43, Eddie James <eajames@linux.ibm.com> wrote:
>
> This series fixes a number of issues introduced in the Rainier device tree.
> It also brings the device tree up to date with the latest hardware revision.
>
> Eddie James (4):
> ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8
> ARM: dts: aspeed: Rainier: Fix humidity sensor bus address
> ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes
> ARM: dts: aspeed: Rainier: Update to pass 2 hardware
Reviewed-by: Joel Stanley <joel@jms.id.au>
I have applied these to send to mainline.
Cheers,
Joel
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 0/4] ARM: dts: aspeed: Rainier: Various fixes and update
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
0 siblings, 0 replies; 7+ messages in thread
From: Joel Stanley @ 2021-04-16 2:48 UTC (permalink / raw)
To: linux-aspeed
On Fri, 16 Apr 2021 at 02:47, Joel Stanley <joel@jms.id.au> wrote:
>
> On Tue, 13 Apr 2021 at 19:43, Eddie James <eajames@linux.ibm.com> wrote:
> >
> > This series fixes a number of issues introduced in the Rainier device tree.
> > It also brings the device tree up to date with the latest hardware revision.
> >
> > Eddie James (4):
> > ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8
> > ARM: dts: aspeed: Rainier: Fix humidity sensor bus address
> > ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes
> > ARM: dts: aspeed: Rainier: Update to pass 2 hardware
>
> Reviewed-by: Joel Stanley <joel@jms.id.au>
>
> I have applied these to send to mainline.
Next time, please make sure you cc linux-arm-kernel. This way they are
archived on lore, which is how I grab the patches.
^ permalink raw reply [flat|nested] 7+ messages in thread