* [PATCH 01/11] ARM: dts: aspeed: minerva: Revise the name of DTS
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 02/11] ARM: dts: aspeed: minerva: Modify mac3 setting Yang Chen
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
The project Minerva which is the platform used by Meta has two boards: the
Chassis Management Module (Minerva) and the Motherboard (Harma), so change
the DTS name to minerva here for CMM use.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/Makefile | 2 +-
...facebook-minerva-cmc.dts => aspeed-bmc-facebook-minerva.dts} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/boot/dts/aspeed/{aspeed-bmc-facebook-minerva-cmc.dts => aspeed-bmc-facebook-minerva.dts} (99%)
diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
index d3ac20e316d0..b1da302dbcd6 100644
--- a/arch/arm/boot/dts/aspeed/Makefile
+++ b/arch/arm/boot/dts/aspeed/Makefile
@@ -19,7 +19,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-facebook-fuji.dtb \
aspeed-bmc-facebook-galaxy100.dtb \
aspeed-bmc-facebook-greatlakes.dtb \
- aspeed-bmc-facebook-minerva-cmc.dtb \
+ aspeed-bmc-facebook-minerva.dtb \
aspeed-bmc-facebook-minipack.dtb \
aspeed-bmc-facebook-tiogapass.dtb \
aspeed-bmc-facebook-wedge40.dtb \
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
similarity index 99%
rename from arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
rename to arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index f04ef9063520..c755fb3258a4 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -7,7 +7,7 @@
#include <dt-bindings/i2c/i2c.h>
/ {
- model = "Facebook Minerva CMC";
+ model = "Facebook Minerva CMM";
compatible = "facebook,minerva-cmc", "aspeed,ast2600";
aliases {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/11] ARM: dts: aspeed: minerva: Modify mac3 setting
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
2023-12-12 7:51 ` [PATCH 01/11] ARM: dts: aspeed: minerva: Revise the name of DTS Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 03/11] ARM: dts: aspeed: minerva: Change sgpio use Yang Chen
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Remove the unuse setting and fix the link to 100 M
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index c755fb3258a4..9979dba1ef0e 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -48,10 +48,13 @@ &wdt1 {
&mac3 {
status = "okay";
+ phy-mode = "rmii";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii4_default>;
- use-ncsi;
- mlx,multi-host;
+ fixed-link {
+ speed = <100>;
+ full-duplex;
+ };
};
&fmc {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/11] ARM: dts: aspeed: minerva: Change sgpio use
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
2023-12-12 7:51 ` [PATCH 01/11] ARM: dts: aspeed: minerva: Revise the name of DTS Yang Chen
2023-12-12 7:51 ` [PATCH 02/11] ARM: dts: aspeed: minerva: Modify mac3 setting Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 04/11] ARM: dts: aspeed: minerva: Enable power monitor device Yang Chen
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Correct the sgpio use from sgpiom1 to sgpiom0
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 9979dba1ef0e..ad77057f921c 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -78,7 +78,7 @@ &rtc {
status = "okay";
};
-&sgpiom1 {
+&sgpiom0 {
status = "okay";
ngpios = <128>;
bus-frequency = <2000000>;
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/11] ARM: dts: aspeed: minerva: Enable power monitor device
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (2 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 03/11] ARM: dts: aspeed: minerva: Change sgpio use Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 05/11] ARM: dts: aspeed: minerva: Add temperature sensor Yang Chen
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Enable power monitor device ina230 and ltc2945 on the i2c bus 0
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../aspeed/aspeed-bmc-facebook-minerva.dts | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index ad77057f921c..ee9691647e4a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -86,6 +86,28 @@ &sgpiom0 {
&i2c0 {
status = "okay";
+
+ power-monitor@40 {
+ compatible = "ti,ina230";
+ reg = <0x40>;
+ shunt-resistor = <1000>;
+ };
+
+ power-monitor@41 {
+ compatible = "ti,ina230";
+ reg = <0x41>;
+ shunt-resistor = <1000>;
+ };
+
+ power-monitor@67 {
+ compatible = "adi,ltc2945";
+ reg = <0x67>;
+ };
+
+ power-monitor@68 {
+ compatible = "adi,ltc2945";
+ reg = <0x68>;
+ };
};
&i2c1 {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/11] ARM: dts: aspeed: minerva: Add temperature sensor
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (3 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 04/11] ARM: dts: aspeed: minerva: Enable power monitor device Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 06/11] ARM: dts: aspeed: minerva: correct the address of eeprom Yang Chen
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add one temperature sensor on i2c bus 1
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index ee9691647e4a..783d4d5a8f3d 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -115,7 +115,12 @@ &i2c1 {
temperature-sensor@4b {
compatible = "ti,tmp75";
- reg = <0x4B>;
+ reg = <0x4b>;
+ };
+
+ temperature-sensor@48 {
+ compatible = "ti,tmp75";
+ reg = <0x48>;
};
eeprom@51 {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/11] ARM: dts: aspeed: minerva: correct the address of eeprom
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (4 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 05/11] ARM: dts: aspeed: minerva: Add temperature sensor Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 07/11] ARM: dts: aspeed: minerva: add bus labels and aliases Yang Chen
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Correct the address from 0x51 to 0x54 of eeprom on the i2c bus 1
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 783d4d5a8f3d..f2a48033ac5c 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -123,9 +123,9 @@ temperature-sensor@48 {
reg = <0x48>;
};
- eeprom@51 {
+ eeprom@54 {
compatible = "atmel,24c128";
- reg = <0x51>;
+ reg = <0x54>;
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 07/11] ARM: dts: aspeed: minerva: add bus labels and aliases
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (5 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 06/11] ARM: dts: aspeed: minerva: correct the address of eeprom Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 08/11] ARM: dts: aspeed: minerva: add fan rpm controller Yang Chen
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add bus labels and aliases for the fan control board.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../aspeed/aspeed-bmc-facebook-minerva.dts | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index f2a48033ac5c..f4cb5ef72310 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -12,6 +12,16 @@ / {
aliases {
serial5 = &uart5;
+ /*
+ * PCA9548 (2-0077) provides 8 channels connecting to
+ * 6 pcs of FCB (Fan Controller Board).
+ */
+ i2c16 = &imux16;
+ i2c17 = &imux17;
+ i2c18 = &imux18;
+ i2c19 = &imux19;
+ i2c20 = &imux20;
+ i2c21 = &imux21;
};
chosen {
@@ -139,7 +149,7 @@ i2c-mux@77 {
#size-cells = <0>;
i2c-mux-idle-disconnect;
- i2c@0 {
+ imux16: i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
@@ -150,7 +160,7 @@ eeprom@50 {
};
};
- i2c@1 {
+ imux17: i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
@@ -161,7 +171,7 @@ eeprom@50 {
};
};
- i2c@2 {
+ imux18: i2c@2 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2>;
@@ -172,7 +182,7 @@ eeprom@50 {
};
};
- i2c@3 {
+ imux19: i2c@3 {
#address-cells = <1>;
#size-cells = <0>;
reg = <3>;
@@ -183,7 +193,7 @@ eeprom@50 {
};
};
- i2c@4 {
+ imux20: i2c@4 {
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
@@ -194,7 +204,7 @@ eeprom@50 {
};
};
- i2c@5 {
+ imux21: i2c@5 {
#address-cells = <1>;
#size-cells = <0>;
reg = <5>;
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/11] ARM: dts: aspeed: minerva: add fan rpm controller
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (6 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 07/11] ARM: dts: aspeed: minerva: add bus labels and aliases Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 09/11] ARM: dts: aspeed: minerva: Add led-fan-fault gpio Yang Chen
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add fan rpm controller max31790 on all bus of FCB.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../aspeed/aspeed-bmc-facebook-minerva.dts | 42 +++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index f4cb5ef72310..c7445c819baf 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -158,6 +158,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
imux17: i2c@1 {
@@ -169,6 +176,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
imux18: i2c@2 {
@@ -180,6 +194,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
imux19: i2c@3 {
@@ -191,6 +212,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
imux20: i2c@4 {
@@ -202,6 +230,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
imux21: i2c@5 {
@@ -213,6 +248,13 @@ eeprom@50 {
compatible = "atmel,24c128";
reg = <0x50>;
};
+
+ pwm@5e{
+ compatible = "max31790";
+ reg = <0x5e>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/11] ARM: dts: aspeed: minerva: Add led-fan-fault gpio
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (7 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 08/11] ARM: dts: aspeed: minerva: add fan rpm controller Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:51 ` [PATCH 10/11] ARM: dts: aspeed: minerva: add gpio line name Yang Chen
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add led-fan-fault gpio pin on the PCA9555 on the i2c bus 0.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index c7445c819baf..090fe2f6b1d8 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -39,6 +39,16 @@ iio-hwmon {
<&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>,
<&adc1 2>;
};
+
+ leds {
+ compatible = "gpio-leds";
+
+ led-fan-fault {
+ label = "led-fan-fault";
+ gpios = <&leds_gpio 9 GPIO_ACTIVE_HIGH>;
+ default-state = "off";
+ };
+ };
};
&uart6 {
@@ -118,6 +128,13 @@ power-monitor@68 {
compatible = "adi,ltc2945";
reg = <0x68>;
};
+
+ leds_gpio: gpio@19 {
+ compatible = "nxp,pca9555";
+ reg = <0x19>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
};
&i2c1 {
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/11] ARM: dts: aspeed: minerva: add gpio line name
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (8 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 09/11] ARM: dts: aspeed: minerva: Add led-fan-fault gpio Yang Chen
@ 2023-12-12 7:51 ` Yang Chen
2023-12-12 7:52 ` [PATCH 11/11] ARM: dts: aspeed: minerva: add sgpio " Yang Chen
2023-12-14 0:43 ` [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Joel Stanley
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:51 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add the GPIO line name that the project's function can use by the
meaningful name.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../aspeed/aspeed-bmc-facebook-minerva.dts | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 090fe2f6b1d8..31197183cc59 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -362,3 +362,33 @@ &ehci1 {
&uhci {
status = "okay";
};
+
+&gpio0 {
+ gpio-line-names =
+ /*A0-A7*/ "","","","","","","","",
+ /*B0-B7*/ "","","","","","","","",
+ /*C0-C7*/ "","","","","BLADE_UART_SEL2","","","",
+ /*D0-D7*/ "","","","","","","","",
+ /*E0-E7*/ "","","","","","","","",
+ /*F0-F7*/ "","","","","","","","",
+ /*G0-G7*/ "","","","","","","","",
+ /*H0-H7*/ "","","","","","","","",
+ /*I0-I7*/ "","","","","","","","",
+ /*J0-J7*/ "","","","","","","","",
+ /*K0-K7*/ "","","","","","","","",
+ /*L0-L7*/ "","","","","BLADE_UART_SEL0","","","",
+ /*M0-M7*/ "","","","","","BLADE_UART_SEL1","","",
+ /*N0-N7*/ "","","","","","","","",
+ /*O0-O7*/ "","","","","","","","",
+ /*P0-P7*/ "","","","","","","","",
+ /*Q0-Q7*/ "","","","","","","","",
+ /*R0-R7*/ "","","","","","","","",
+ /*S0-S7*/ "","","","","","","","",
+ /*T0-T7*/ "","","","","","","","",
+ /*U0-U7*/ "","","","","","","","",
+ /*V0-V7*/ "","","","","BAT_DETECT","","","",
+ /*W0-W7*/ "","","","","","","","",
+ /*X0-X7*/ "","","BLADE_UART_SEL3","","","","","",
+ /*Y0-Y7*/ "","","","","","","","",
+ /*Z0-Z7*/ "","","","","","","","";
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 11/11] ARM: dts: aspeed: minerva: add sgpio line name
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (9 preceding siblings ...)
2023-12-12 7:51 ` [PATCH 10/11] ARM: dts: aspeed: minerva: add gpio line name Yang Chen
@ 2023-12-12 7:52 ` Yang Chen
2023-12-14 0:43 ` [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Joel Stanley
11 siblings, 0 replies; 13+ messages in thread
From: Yang Chen @ 2023-12-12 7:52 UTC (permalink / raw)
To: robh+dt, krzysztof.kozlowski+dt, conor+dt, joel, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
Cc: Jerry.Lin, EasonChen1, Leslie.Tong, yangchen.openbmc
Add the SGPIO line name that the project's function can use by the
meaningful name.
Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
---
.../aspeed/aspeed-bmc-facebook-minerva.dts | 149 ++++++++++++++++++
1 file changed, 149 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 31197183cc59..942e53d5c714 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -392,3 +392,152 @@ &gpio0 {
/*Y0-Y7*/ "","","","","","","","",
/*Z0-Z7*/ "","","","","","","","";
};
+
+&sgpiom0 {
+ gpio-line-names =
+ /*"input pin","output pin"*/
+ /*A0 - A7*/
+ "PRSNT_MTIA_BLADE0_N","PWREN_MTIA_BLADE0_EN",
+ "PRSNT_MTIA_BLADE1_N","PWREN_MTIA_BLADE1_EN",
+ "PRSNT_MTIA_BLADE2_N","PWREN_MTIA_BLADE2_EN",
+ "PRSNT_MTIA_BLADE3_N","PWREN_MTIA_BLADE3_EN",
+ "PRSNT_MTIA_BLADE4_N","PWREN_MTIA_BLADE4_EN",
+ "PRSNT_MTIA_BLADE5_N","PWREN_MTIA_BLADE5_EN",
+ "PRSNT_MTIA_BLADE6_N","PWREN_MTIA_BLADE6_EN",
+ "PRSNT_MTIA_BLADE7_N","PWREN_MTIA_BLADE7_EN",
+ /*B0 - B7*/
+ "PRSNT_MTIA_BLADE8_N","PWREN_MTIA_BLADE8_EN",
+ "PRSNT_MTIA_BLADE9_N","PWREN_MTIA_BLADE9_EN",
+ "PRSNT_MTIA_BLADE10_N","PWREN_MTIA_BLADE10_EN",
+ "PRSNT_MTIA_BLADE11_N","PWREN_MTIA_BLADE11_EN",
+ "PRSNT_MTIA_BLADE12_N","PWREN_MTIA_BLADE12_EN",
+ "PRSNT_MTIA_BLADE13_N","PWREN_MTIA_BLADE13_EN",
+ "PRSNT_MTIA_BLADE14_N","PWREN_MTIA_BLADE14_EN",
+ "PRSNT_MTIA_BLADE15_N","PWREN_MTIA_BLADE15_EN",
+ /*C0 - C7*/
+ "PRSNT_NW_BLADE0_N","PWREN_NW_BLADE0_EN",
+ "PRSNT_NW_BLADE1_N","PWREN_NW_BLADE1_EN",
+ "PRSNT_NW_BLADE2_N","PWREN_NW_BLADE2_EN",
+ "PRSNT_NW_BLADE3_N","PWREN_NW_BLADE3_EN",
+ "PRSNT_NW_BLADE4_N","PWREN_NW_BLADE4_EN",
+ "PRSNT_NW_BLADE5_N","PWREN_NW_BLADE5_EN",
+ "PRSNT_FCB_TOP_0_N","PWREN_MTIA_BLADE0_HSC_EN",
+ "PRSNT_FCB_TOP_1_N","PWREN_MTIA_BLADE1_HSC_EN",
+ /*D0 - D7*/
+ "PRSNT_FCB_MIDDLE_0_N","PWREN_MTIA_BLADE2_HSC_EN",
+ "PRSNT_FCB_MIDDLE_1_N","PWREN_MTIA_BLADE3_HSC_EN",
+ "PRSNT_FCB_BOTTOM_0_N","PWREN_MTIA_BLADE4_HSC_EN",
+ "PRSNT_FCB_BOTTOM_1_N","PWREN_MTIA_BLADE5_HSC_EN",
+ "PWRGD_MTIA_BLADE0_PWROK_L_BUF","PWREN_MTIA_BLADE6_HSC_EN",
+ "PWRGD_MTIA_BLADE1_PWROK_L_BUF","PWREN_MTIA_BLADE7_HSC_EN",
+ "PWRGD_MTIA_BLADE2_PWROK_L_BUF","PWREN_MTIA_BLADE8_HSC_EN",
+ "PWRGD_MTIA_BLADE3_PWROK_L_BUF","PWREN_MTIA_BLADE9_HSC_EN",
+ /*E0 - E7*/
+ "PWRGD_MTIA_BLADE4_PWROK_L_BUF","PWREN_MTIA_BLADE10_HSC_EN",
+ "PWRGD_MTIA_BLADE5_PWROK_L_BUF","PWREN_MTIA_BLADE11_HSC_EN",
+ "PWRGD_MTIA_BLADE6_PWROK_L_BUF","PWREN_MTIA_BLADE12_HSC_EN",
+ "PWRGD_MTIA_BLADE7_PWROK_L_BUF","PWREN_MTIA_BLADE13_HSC_EN",
+ "PWRGD_MTIA_BLADE8_PWROK_L_BUF","PWREN_MTIA_BLADE14_HSC_EN",
+ "PWRGD_MTIA_BLADE9_PWROK_L_BUF","PWREN_MTIA_BLADE15_HSC_EN",
+ "PWRGD_MTIA_BLADE10_PWROK_L_BUF","PWREN_NW_BLADE0_HSC_EN",
+ "PWRGD_MTIA_BLADE11_PWROK_L_BUF","PWREN_NW_BLADE1_HSC_EN",
+ /*F0 - F7*/
+ "PWRGD_MTIA_BLADE12_PWROK_L_BUF","PWREN_NW_BLADE2_HSC_EN",
+ "PWRGD_MTIA_BLADE13_PWROK_L_BUF","PWREN_NW_BLADE3_HSC_EN",
+ "PWRGD_MTIA_BLADE14_PWROK_L_BUF","PWREN_NW_BLADE4_HSC_EN",
+ "PWRGD_MTIA_BLADE15_PWROK_L_BUF","PWREN_NW_BLADE5_HSC_EN",
+ "PWRGD_NW_BLADE0_PWROK_L_BUF","PWREN_FCB_TOP_L_EN",
+ "PWRGD_NW_BLADE1_PWROK_L_BUF","PWREN_FCB_TOP_R_EN",
+ "PWRGD_NW_BLADE2_PWROK_L_BUF","PWREN_FCB_MIDDLE_L_EN",
+ "PWRGD_NW_BLADE3_PWROK_L_BUF","PWREN_FCB_MIDDLE_R_EN",
+ /*G0 - G7*/
+ "PWRGD_NW_BLADE4_PWROK_L_BUF","PWREN_FCB_BOTTOM_L_EN",
+ "PWRGD_NW_BLADE5_PWROK_L_BUF","PWREN_FCB_BOTTOM_R_EN",
+ "PWRGD_FCB_TOP_0_PWROK_L_BUF","FM_CMM_AC_CYCLE_N",
+ "PWRGD_FCB_TOP_1_PWROK_L_BUF","MGMT_SFP_TX_DIS",
+ "PWRGD_FCB_MIDDLE_0_PWROK_L_BUF","",
+ "PWRGD_FCB_MIDDLE_1_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE0_1_N",
+ "PWRGD_FCB_BOTTOM_0_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE2_3_N",
+ "PWRGD_FCB_BOTTOM_1_PWROK_L_BUF","RST_I2CRST_MTIA_BLADE4_5_N",
+ /*H0 - H7*/
+ "LEAK_DETECT_MTIA_BLADE0_N_BUF","RST_I2CRST_MTIA_BLADE6_7_N",
+ "LEAK_DETECT_MTIA_BLADE1_N_BUF","RST_I2CRST_MTIA_BLADE8_9_N",
+ "LEAK_DETECT_MTIA_BLADE2_N_BUF","RST_I2CRST_MTIA_BLADE10_11_N",
+ "LEAK_DETECT_MTIA_BLADE3_N_BUF","RST_I2CRST_MTIA_BLADE12_13_N",
+ "LEAK_DETECT_MTIA_BLADE4_N_BUF","RST_I2CRST_MTIA_BLADE14_15_N",
+ "LEAK_DETECT_MTIA_BLADE5_N_BUF","RST_I2CRST_NW_BLADE0_1_2_N",
+ "LEAK_DETECT_MTIA_BLADE6_N_BUF","RST_I2CRST_NW_BLADE3_4_5_N",
+ "LEAK_DETECT_MTIA_BLADE7_N_BUF","RST_I2CRST_FCB_N",
+ /*I0 - I7*/
+ "LEAK_DETECT_MTIA_BLADE8_N_BUF","RST_I2CRST_FCB_B_L_N",
+ "LEAK_DETECT_MTIA_BLADE9_N_BUF","RST_I2CRST_FCB_B_R_N",
+ "LEAK_DETECT_MTIA_BLADE10_N_BUF","RST_I2CRST_FCB_M_L_N",
+ "LEAK_DETECT_MTIA_BLADE11_N_BUF","RST_I2CRST_FCB_M_R_N",
+ "LEAK_DETECT_MTIA_BLADE12_N_BUF","RST_I2CRST_FCB_T_L_N",
+ "LEAK_DETECT_MTIA_BLADE13_N_BUF","RST_I2CRST_FCB_T_R_N",
+ "LEAK_DETECT_MTIA_BLADE14_N_BUF","BMC_READY",
+ "LEAK_DETECT_MTIA_BLADE15_N_BUF","wFM_88E6393X_BIN_UPDATE_EN_N",
+ /*J0 - J7*/
+ "LEAK_DETECT_NW_BLADE0_N_BUF","WATER_VALVE_CLOSED_N",
+ "LEAK_DETECT_NW_BLADE1_N_BUF","",
+ "LEAK_DETECT_NW_BLADE2_N_BUF","",
+ "LEAK_DETECT_NW_BLADE3_N_BUF","",
+ "LEAK_DETECT_NW_BLADE4_N_BUF","",
+ "LEAK_DETECT_NW_BLADE5_N_BUF","",
+ "MTIA_BLADE0_STATUS_LED","",
+ "MTIA_BLADE1_STATUS_LED","",
+ /*K0 - K7*/
+ "MTIA_BLADE2_STATUS_LED","",
+ "MTIA_BLADE3_STATUS_LED","",
+ "MTIA_BLADE4_STATUS_LED","",
+ "MTIA_BLADE5_STATUS_LED","",
+ "MTIA_BLADE6_STATUS_LED","",
+ "MTIA_BLADE7_STATUS_LED","",
+ "MTIA_BLADE8_STATUS_LED","",
+ "MTIA_BLADE9_STATUS_LED","",
+ /*L0 - L7*/
+ "MTIA_BLADE10_STATUS_LED","",
+ "MTIA_BLADE11_STATUS_LED","",
+ "MTIA_BLADE12_STATUS_LED","",
+ "MTIA_BLADE13_STATUS_LED","",
+ "MTIA_BLADE14_STATUS_LED","",
+ "MTIA_BLADE15_STATUS_LED","",
+ "NW_BLADE0_STATUS_LED","",
+ "NW_BLADE1_STATUS_LED","",
+ /*M0 - M7*/
+ "NW_BLADE2_STATUS_LED","",
+ "NW_BLADE3_STATUS_LED","",
+ "NW_BLADE4_STATUS_LED","",
+ "NW_BLADE5_STATUS_LED","",
+ "RPU_READY","",
+ "IT_GEAR_RPU_LINK_N","",
+ "IT_GEAR_LEAK","",
+ "WATER_VALVE_CLOSED_N","",
+ /*N0 - N7*/
+ "VALVE_STS0","",
+ "VALVE_STS1","",
+ "VALVE_STS2","",
+ "VALVE_STS3","",
+ "CR_TOGGLE_BOOT_BUF_N","",
+ "CMM_LC_RDY_LED_N","",
+ "CMM_LC_UNRDY_LED_N","",
+ "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N","",
+ /*O0 - O7*/
+ "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N","",
+ "BOT_BCB_CABLE_PRSNT_N","",
+ "TOP_BCB_CABLE_PRSNT_N","",
+ "CHASSIS0_LEAK_Q_N","",
+ "CHASSIS1_LEAK_Q_N","",
+ "LEAK0_DETECT","",
+ "LEAK1_DETECT","",
+ "MGMT_SFP_PRSNT_N","",
+ /*P0 - P7*/
+ "MGMT_SFP_TX_FAULT","",
+ "MGMT_SFP_RX_LOS","",
+ "","",
+ "","",
+ "","",
+ "","",
+ "","",
+ "","";
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600)
2023-12-12 7:51 [PATCH 00/11] Modify DTS of META Minerva CMM BMC(AST2600) Yang Chen
` (10 preceding siblings ...)
2023-12-12 7:52 ` [PATCH 11/11] ARM: dts: aspeed: minerva: add sgpio " Yang Chen
@ 2023-12-14 0:43 ` Joel Stanley
11 siblings, 0 replies; 13+ messages in thread
From: Joel Stanley @ 2023-12-14 0:43 UTC (permalink / raw)
To: Yang Chen
Cc: robh+dt, krzysztof.kozlowski+dt, conor+dt, andrew, patrick,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
Jerry.Lin, EasonChen1, Leslie.Tong
On Tue, 12 Dec 2023 at 18:24, Yang Chen <yangchen.openbmc@gmail.com> wrote:
>
> This series modifies the DTS of the Minerva CMM which is the board on the
> META platform that uses the ASPEED SoC(AST2600).
Looks good. I've merged this for submission in v6.8.
Reviewed-by: Joel Stanley <joel@jms.id.au>
^ permalink raw reply [flat|nested] 13+ messages in thread