* [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates
@ 2021-04-30 18:59 Eddie James
2021-04-30 18:59 ` [PATCH 1/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan channels Eddie James
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Eddie James @ 2021-04-30 18:59 UTC (permalink / raw)
To: linux-aspeed
This series fixes a few new issues found in the Rainier and Everest
machine device trees. It also adds the LEDs that are directly
connected to the AST2600 and controlled by GPIO.
Andrew Geissler (1):
ARM: dts: aspeed: Rainier 1S4U: Fix fan channels
Eddie James (1):
ARM: dts: aspeed: Rainier 4U: Remove fan updates
Santosh Puranik (1):
ARM: dts: aspeed: Everest: Fix cable card PCA chips
Vishwanatha Subbanna (1):
ARM: dts: aspeed: Everest: Add directly controlled LEDs
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 201 ++++++++++--------
.../boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts | 2 +-
.../boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 30 ---
3 files changed, 115 insertions(+), 118 deletions(-)
--
2.27.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan channels
2021-04-30 18:59 [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates Eddie James
@ 2021-04-30 18:59 ` Eddie James
2021-04-30 18:59 ` [PATCH 2/4] ARM: dts: aspeed: Everest: Fix cable card PCA chips Eddie James
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Eddie James @ 2021-04-30 18:59 UTC (permalink / raw)
To: linux-aspeed
From: Andrew Geissler <geissonator@yahoo.com>
The 1S4U chassis populates fan channels 0, 1, 2, and 4. Update the DTS
to reflect this.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.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] 5+ messages in thread
* [PATCH 2/4] ARM: dts: aspeed: Everest: Fix cable card PCA chips
2021-04-30 18:59 [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates Eddie James
2021-04-30 18:59 ` [PATCH 1/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan channels Eddie James
@ 2021-04-30 18:59 ` Eddie James
2021-04-30 18:59 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 4U: Remove fan updates Eddie James
2021-04-30 19:00 ` [PATCH 4/4] ARM: dts: aspeed: Everest: Add directly controlled LEDs Eddie James
3 siblings, 0 replies; 5+ messages in thread
From: Eddie James @ 2021-04-30 18:59 UTC (permalink / raw)
To: linux-aspeed
From: Santosh Puranik <santosh.puranik@in.ibm.com>
Correct two PCA chips which were placed on the wrong I2C bus and
address.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 168 +++++++++----------
1 file changed, 83 insertions(+), 85 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 3295c8c7c05c..27af28c8847d 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -353,10 +353,47 @@ gpio at 15 {
&i2c1 {
status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
- pca2: pca9552 at 61 {
+&i2c3 {
+ status = "okay";
+
+ eeprom at 54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ };
+
+ power-supply at 68 {
+ compatible = "ibm,cffps";
+ reg = <0x68>;
+ };
+
+ power-supply at 69 {
+ compatible = "ibm,cffps";
+ reg = <0x69>;
+ };
+
+ power-supply at 6a {
+ compatible = "ibm,cffps";
+ reg = <0x6a>;
+ };
+
+ power-supply at 6b {
+ compatible = "ibm,cffps";
+ reg = <0x6b>;
+ };
+};
+
+&i2c4 {
+ status = "okay";
+
+ pca2: pca9552 at 65 {
compatible = "nxp,pca9552";
- reg = <0x61>;
+ reg = <0x65>;
#address-cells = <1>;
#size-cells = <0>;
@@ -424,12 +461,54 @@ gpio at 9 {
reg = <9>;
type = <PCA955X_TYPE_GPIO>;
};
+ };
+ i2c-switch at 70 {
+ compatible = "nxp,pca9546";
+ reg = <0x70>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+ i2c-mux-idle-disconnect;
+
+ i2c4mux0chn0: i2c at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0>;
+ eeprom at 52 {
+ compatible = "atmel,24c64";
+ reg = <0x52>;
+ };
+ };
+
+ i2c4mux0chn1: i2c at 1 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <1>;
+ eeprom at 50 {
+ compatible = "atmel,24c64";
+ reg = <0x50>;
+ };
+ };
+
+ i2c4mux0chn2: i2c at 2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <2>;
+ eeprom at 51 {
+ compatible = "atmel,24c64";
+ reg = <0x51>;
+ };
+ };
};
+};
- pca3: pca9552 at 62 {
+&i2c5 {
+ status = "okay";
+
+ pca3: pca9552 at 66 {
compatible = "nxp,pca9552";
- reg = <0x62>;
+ reg = <0x66>;
#address-cells = <1>;
#size-cells = <0>;
@@ -512,87 +591,6 @@ gpio at 11 {
};
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&i2c3 {
- status = "okay";
-
- eeprom at 54 {
- compatible = "atmel,24c128";
- reg = <0x54>;
- };
-
- power-supply at 68 {
- compatible = "ibm,cffps";
- reg = <0x68>;
- };
-
- power-supply at 69 {
- compatible = "ibm,cffps";
- reg = <0x69>;
- };
-
- power-supply at 6a {
- compatible = "ibm,cffps";
- reg = <0x6a>;
- };
-
- power-supply at 6b {
- compatible = "ibm,cffps";
- reg = <0x6b>;
- };
-};
-
-&i2c4 {
- status = "okay";
-
- i2c-switch at 70 {
- compatible = "nxp,pca9546";
- reg = <0x70>;
- #address-cells = <1>;
- #size-cells = <0>;
- status = "okay";
- i2c-mux-idle-disconnect;
-
- i2c4mux0chn0: i2c at 0 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0>;
- eeprom at 52 {
- compatible = "atmel,24c64";
- reg = <0x52>;
- };
- };
-
- i2c4mux0chn1: i2c at 1 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <1>;
- eeprom at 50 {
- compatible = "atmel,24c64";
- reg = <0x50>;
- };
- };
-
- i2c4mux0chn2: i2c at 2 {
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <2>;
- eeprom at 51 {
- compatible = "atmel,24c64";
- reg = <0x51>;
- };
- };
- };
-};
-
-&i2c5 {
- status = "okay";
-
i2c-switch at 70 {
compatible = "nxp,pca9546";
reg = <0x70>;
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] ARM: dts: aspeed: Rainier 4U: Remove fan updates
2021-04-30 18:59 [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates Eddie James
2021-04-30 18:59 ` [PATCH 1/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan channels Eddie James
2021-04-30 18:59 ` [PATCH 2/4] ARM: dts: aspeed: Everest: Fix cable card PCA chips Eddie James
@ 2021-04-30 18:59 ` Eddie James
2021-04-30 19:00 ` [PATCH 4/4] ARM: dts: aspeed: Everest: Add directly controlled LEDs Eddie James
3 siblings, 0 replies; 5+ messages in thread
From: Eddie James @ 2021-04-30 18:59 UTC (permalink / raw)
To: linux-aspeed
The 4U fans do not need a different "tach-pulses" property than the 2U
machine. In addition, the "maxim,fan-dual-tach" property does not exist
upstream yet, so it should also be removed.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
.../boot/dts/aspeed-bmc-ibm-rainier-4u.dts | 30 -------------------
1 file changed, 30 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
index f7fd3b3c90d0..342546a3c0f5 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
@@ -19,33 +19,3 @@ power-supply at 6b {
reg = <0x6b>;
};
};
-
-&fan0 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
-
-&fan1 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
-
-&fan2 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
-
-&fan3 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
-
-&fan4 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
-
-&fan5 {
- tach-pulses = <4>;
- /delete-property/ maxim,fan-dual-tach;
-};
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] ARM: dts: aspeed: Everest: Add directly controlled LEDs
2021-04-30 18:59 [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates Eddie James
` (2 preceding siblings ...)
2021-04-30 18:59 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 4U: Remove fan updates Eddie James
@ 2021-04-30 19:00 ` Eddie James
3 siblings, 0 replies; 5+ messages in thread
From: Eddie James @ 2021-04-30 19:00 UTC (permalink / raw)
To: linux-aspeed
From: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
These LEDs are directly connected to the BMC's GPIO bank
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 33 ++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 27af28c8847d..2ddd10e93a80 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -202,6 +202,35 @@ fan3-presence {
linux,code = <12>;
};
};
+
+ leds {
+ compatible = "gpio-leds";
+
+ /* RTC battery fault LED at the back */
+ led-rtc-battery {
+ gpios = <&gpio0 ASPEED_GPIO(H, 0) GPIO_ACTIVE_LOW>;
+ };
+
+ /* BMC Card fault LED at the back */
+ led-bmc {
+ gpios = <&gpio0 ASPEED_GPIO(H, 1) GPIO_ACTIVE_LOW>;
+ };
+
+ /* Enclosure Identify LED at the back */
+ led-rear-enc-id0 {
+ gpios = <&gpio0 ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>;
+ };
+
+ /* Enclosure fault LED at the back */
+ led-rear-enc-fault0 {
+ gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>;
+ };
+
+ /* PCIE slot power LED */
+ led-pcieslot-power {
+ gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_LOW>;
+ };
+ };
};
&gpio0 {
@@ -214,7 +243,7 @@ &gpio0 {
/*F0-F7*/ "PIN_HOLE_RESET_IN_N","","",
"PIN_HOLE_RESET_OUT_N","","","","",
/*G0-G7*/ "","","","","","","","",
- /*H0-H7*/ "","","","","","","","",
+ /*H0-H7*/ "led-rtc-battery","led-bmc","led-rear-enc-id0","led-rear-enc-fault0","","","","",
/*I0-I7*/ "","","","","","","","",
/*J0-J7*/ "","","","","","","","",
/*K0-K7*/ "","","","","","","","",
@@ -222,7 +251,7 @@ &gpio0 {
/*M0-M7*/ "","","","","","","","",
/*N0-N7*/ "","","","","","","","",
/*O0-O7*/ "","","","","","","","",
- /*P0-P7*/ "","","","","","","","",
+ /*P0-P7*/ "","","","","led-pcieslot-power","","","",
/*Q0-Q7*/ "","","","","","","","",
/*R0-R7*/ "","","","","","I2C_FLASH_MICRO_N","","",
/*S0-S7*/ "","","","","","","","",
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-30 19:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30 18:59 [PATCH 0/4] ARM: dts: aspeed: Rainier and Everest updates Eddie James
2021-04-30 18:59 ` [PATCH 1/4] ARM: dts: aspeed: Rainier 1S4U: Fix fan channels Eddie James
2021-04-30 18:59 ` [PATCH 2/4] ARM: dts: aspeed: Everest: Fix cable card PCA chips Eddie James
2021-04-30 18:59 ` [PATCH 3/4] ARM: dts: aspeed: Rainier 4U: Remove fan updates Eddie James
2021-04-30 19:00 ` [PATCH 4/4] ARM: dts: aspeed: Everest: Add directly controlled LEDs Eddie James
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).