* [PATCH v2 0/3] ARM: dts: Update devicetree of Asrock X570D4U BMC
@ 2024-04-03 13:28 Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 1/3] ARM: dts: Modify GPIO table for " Renze Nicolai
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Renze Nicolai @ 2024-04-03 13:28 UTC (permalink / raw)
To: renze, linux-arm-kernel, devicetree, linux-kernel, linux-aspeed,
arnd, olof, soc, robh+dt, krzysztof.kozlowski+dt, joel, andrew
These patches change the GPIO table, ADC channel configuration and
I2C bus configuration of the devicetree for the X570D4U BMC as part of
ongoing efforts to support OpenBMC on this platform.
Changes since v1:
- Fixed warnings indicated by checkpatch.pl
- Change commit message of ADC channels commit to match imperative mood
- Restructure GPIO table to better match other ASPEED devices
- Clarify naming scheme better
Best regards,
Renze Nicolai
Renze Nicolai (3):
ARM: dts: Modify GPIO table for Asrock X570D4U BMC
ARM: dts: Disable unused ADC channels for Asrock X570D4U BMC
ARM: dts: Modify I2C bus configuration
.../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 131 ++++++++----------
1 file changed, 57 insertions(+), 74 deletions(-)
--
2.44.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/3] ARM: dts: Modify GPIO table for Asrock X570D4U BMC
2024-04-03 13:28 [PATCH v2 0/3] ARM: dts: Update devicetree of Asrock X570D4U BMC Renze Nicolai
@ 2024-04-03 13:28 ` Renze Nicolai
2024-04-04 1:17 ` Andrew Jeffery
2024-04-03 13:28 ` [PATCH v2 2/3] ARM: dts: Disable unused ADC channels " Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 3/3] ARM: dts: Modify I2C bus configuration Renze Nicolai
2 siblings, 1 reply; 5+ messages in thread
From: Renze Nicolai @ 2024-04-03 13:28 UTC (permalink / raw)
To: renze, linux-arm-kernel, devicetree, linux-kernel, linux-aspeed,
arnd, olof, soc, robh+dt, krzysztof.kozlowski+dt, joel, andrew
Restructure GPIO table to fit maximum line length.
Fix mistakes found while working on OpenBMC
userland configuration and based on probing
the board.
Schematic for this board is not available.
Because of this the choice was made to
use a descriptive method for naming the
GPIOs.
- Push-pull outputs start with output-*
- Open-drain outputs start with control-*
- LED outputs start with led-*
- Inputs start with input-*
- Button inputs start with button-*
- Active low signals end with *-n
Signed-off-by: Renze Nicolai <renze@rnplus.nl>
---
.../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 95 ++++++++-----------
1 file changed, 37 insertions(+), 58 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
index 3c975bc41ae7..dff69d6ff146 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
@@ -79,64 +79,43 @@ iio-hwmon {
&gpio {
status = "okay";
gpio-line-names =
- /*A0-A3*/ "status-locatorled-n", "", "button-nmi-n", "",
- /*A4-A7*/ "", "", "", "",
- /*B0-B3*/ "input-bios-post-cmplt-n", "", "", "",
- /*B4-B7*/ "", "", "", "",
- /*C0-C3*/ "", "", "", "",
- /*C4-C7*/ "", "", "control-locatorbutton", "",
- /*D0-D3*/ "button-power", "control-power", "button-reset", "control-reset",
- /*D4-D7*/ "", "", "", "",
- /*E0-E3*/ "", "", "", "",
- /*E4-E7*/ "", "", "", "",
- /*F0-F3*/ "", "", "", "",
- /*F4-F7*/ "", "", "", "",
- /*G0-G3*/ "output-rtc-battery-voltage-read-enable", "input-id0", "input-id1", "input-id2",
- /*G4-G7*/ "input-alert1-n", "input-alert2-n", "input-alert3-n", "",
- /*H0-H3*/ "", "", "", "",
- /*H4-H7*/ "input-mfg", "", "led-heartbeat-n", "input-caseopen",
- /*I0-I3*/ "", "", "", "",
- /*I4-I7*/ "", "", "", "",
- /*J0-J3*/ "output-bmc-ready", "", "", "",
- /*J4-J7*/ "", "", "", "",
- /*K0-K3*/ "", "", "", "",
- /*K4-K7*/ "", "", "", "",
- /*L0-L3*/ "", "", "", "",
- /*L4-L7*/ "", "", "", "",
- /*M0-M3*/ "", "", "", "",
- /*M4-M7*/ "", "", "", "",
- /*N0-N3*/ "", "", "", "",
- /*N4-N7*/ "", "", "", "",
- /*O0-O3*/ "", "", "", "",
- /*O4-O7*/ "", "", "", "",
- /*P0-P3*/ "", "", "", "",
- /*P4-P7*/ "", "", "", "",
- /*Q0-Q3*/ "", "", "", "",
- /*Q4-Q7*/ "", "", "", "",
- /*R0-R3*/ "", "", "", "",
- /*R4-R7*/ "", "", "", "",
- /*S0-S3*/ "input-bmc-pchhot-n", "", "", "",
- /*S4-S7*/ "", "", "", "",
- /*T0-T3*/ "", "", "", "",
- /*T4-T7*/ "", "", "", "",
- /*U0-U3*/ "", "", "", "",
- /*U4-U7*/ "", "", "", "",
- /*V0-V3*/ "", "", "", "",
- /*V4-V7*/ "", "", "", "",
- /*W0-W3*/ "", "", "", "",
- /*W4-W7*/ "", "", "", "",
- /*X0-X3*/ "", "", "", "",
- /*X4-X7*/ "", "", "", "",
- /*Y0-Y3*/ "", "", "", "",
- /*Y4-Y7*/ "", "", "", "",
- /*Z0-Z3*/ "", "", "led-fault-n", "output-bmc-throttle-n",
- /*Z4-Z7*/ "", "", "", "",
- /*AA0-AA3*/ "input-cpu1-thermtrip-latch-n", "", "input-cpu1-prochot-n", "",
- /*AA4-AC7*/ "", "", "", "",
- /*AB0-AB3*/ "", "", "", "",
- /*AB4-AC7*/ "", "", "", "",
- /*AC0-AC3*/ "", "", "", "",
- /*AC4-AC7*/ "", "", "", "";
+ /* A */ "input-locatorled-n", "", "", "", "", "", "", "",
+ /* B */ "input-bios-post-cmplt-n", "", "", "", "", "", "", "",
+ /* C */ "", "", "", "", "", "", "control-locatorbutton-n", "",
+ /* D */ "button-power-n", "control-power-n", "button-reset-n",
+ "control-reset-n", "", "", "", "",
+ /* E */ "", "", "", "", "", "", "", "",
+ /* F */ "", "", "", "", "", "", "", "",
+ /* G */ "output-hwm-vbat-enable", "input-id0-n", "input-id1-n",
+ "input-id2-n", "input-aux-smb-alert-n", "",
+ "input-psu-smb-alert-n", "",
+ /* H */ "", "", "", "", "input-mfg-mode-n", "",
+ "led-heartbeat-n", "input-case-open-n",
+ /* I */ "", "", "", "", "", "", "", "",
+ /* J */ "output-bmc-ready-n", "", "", "", "", "", "", "",
+ /* K */ "", "", "", "", "", "", "", "",
+ /* L */ "", "", "", "", "", "", "", "",
+ /* M */ "", "", "", "", "", "", "", "",
+ /* N */ "", "", "", "", "", "", "", "",
+ /* O */ "", "", "", "", "", "", "", "",
+ /* P */ "", "", "", "", "", "", "", "",
+ /* Q */ "", "", "", "", "input-bmc-smb-present-n", "", "",
+ "input-pcie-wake-n",
+ /* R */ "", "", "", "", "", "", "", "",
+ /* S */ "input-bmc-pchhot-n", "", "", "", "", "", "", "",
+ /* T */ "", "", "", "", "", "", "", "",
+ /* U */ "", "", "", "", "", "", "", "",
+ /* V */ "", "", "", "", "", "", "", "",
+ /* W */ "", "", "", "", "", "", "", "",
+ /* X */ "", "", "", "", "", "", "", "",
+ /* Y */ "input-sleep-s3-n", "input-sleep-s5-n", "", "", "", "",
+ "", "",
+ /* Z */ "", "", "led-fault-n", "output-bmc-throttle-n", "", "",
+ "", "",
+ /* AA */ "input-cpu1-thermtrip-latch-n", "",
+ "input-cpu1-prochot-n", "", "", "", "", "",
+ /* AB */ "", "input-power-good", "", "", "", "", "", "",
+ /* AC */ "", "", "", "", "", "", "", "";
};
&fmc {
--
2.44.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/3] ARM: dts: Disable unused ADC channels for Asrock X570D4U BMC
2024-04-03 13:28 [PATCH v2 0/3] ARM: dts: Update devicetree of Asrock X570D4U BMC Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 1/3] ARM: dts: Modify GPIO table for " Renze Nicolai
@ 2024-04-03 13:28 ` Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 3/3] ARM: dts: Modify I2C bus configuration Renze Nicolai
2 siblings, 0 replies; 5+ messages in thread
From: Renze Nicolai @ 2024-04-03 13:28 UTC (permalink / raw)
To: renze, linux-arm-kernel, devicetree, linux-kernel, linux-aspeed,
arnd, olof, soc, robh+dt, krzysztof.kozlowski+dt, joel, andrew
Additionally adds labels describing the ADC channels.
Signed-off-by: Renze Nicolai <renze@rnplus.nl>
---
.../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 29 +++++++++----------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
index dff69d6ff146..66318ef8caae 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
@@ -337,20 +337,17 @@ fan@5 {
&adc {
status = "okay";
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_adc0_default
- &pinctrl_adc1_default
- &pinctrl_adc2_default
- &pinctrl_adc3_default
- &pinctrl_adc4_default
- &pinctrl_adc5_default
- &pinctrl_adc6_default
- &pinctrl_adc7_default
- &pinctrl_adc8_default
- &pinctrl_adc9_default
- &pinctrl_adc10_default
- &pinctrl_adc11_default
- &pinctrl_adc12_default
- &pinctrl_adc13_default
- &pinctrl_adc14_default
- &pinctrl_adc15_default>;
+ pinctrl-0 = <&pinctrl_adc0_default /* 3VSB */
+ &pinctrl_adc1_default /* 5VSB */
+ &pinctrl_adc2_default /* VCPU */
+ &pinctrl_adc3_default /* VSOC */
+ &pinctrl_adc4_default /* VCCM */
+ &pinctrl_adc5_default /* APU-VDDP */
+ &pinctrl_adc6_default /* PM-VDD-CLDO */
+ &pinctrl_adc7_default /* PM-VDDCR-S5 */
+ &pinctrl_adc8_default /* PM-VDDCR */
+ &pinctrl_adc9_default /* VBAT */
+ &pinctrl_adc10_default /* 3V */
+ &pinctrl_adc11_default /* 5V */
+ &pinctrl_adc12_default>; /* 12V */
};
--
2.44.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/3] ARM: dts: Modify I2C bus configuration
2024-04-03 13:28 [PATCH v2 0/3] ARM: dts: Update devicetree of Asrock X570D4U BMC Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 1/3] ARM: dts: Modify GPIO table for " Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 2/3] ARM: dts: Disable unused ADC channels " Renze Nicolai
@ 2024-04-03 13:28 ` Renze Nicolai
2 siblings, 0 replies; 5+ messages in thread
From: Renze Nicolai @ 2024-04-03 13:28 UTC (permalink / raw)
To: renze, linux-arm-kernel, devicetree, linux-kernel, linux-aspeed,
arnd, olof, soc, robh+dt, krzysztof.kozlowski+dt, joel, andrew
Enable I2C bus 8 which is exposed on the IPMB_1 connector
on the X570D4U mainboard.
Additionally adds a descriptive comment to I2C busses 1 and 5.
Signed-off-by: Renze Nicolai <renze@rnplus.nl>
---
arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
index 66318ef8caae..8dee4faa9e07 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts
@@ -162,6 +162,7 @@ &i2c0 {
};
&i2c1 {
+ /* Hardware monitoring SMBus */
status = "okay";
w83773g@4c {
@@ -219,6 +220,7 @@ i2c4mux0ch3: i2c@3 {
};
&i2c5 {
+ /* SMBus on BMC connector (BMC_SMB_1) */
status = "okay";
};
@@ -243,6 +245,11 @@ eth1_macaddress: macaddress@3f88 {
};
};
+&i2c8 {
+ /* SMBus on intelligent platform management bus header (IPMB_1) */
+ status = "okay";
+};
+
&gfx {
status = "okay";
};
--
2.44.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/3] ARM: dts: Modify GPIO table for Asrock X570D4U BMC
2024-04-03 13:28 ` [PATCH v2 1/3] ARM: dts: Modify GPIO table for " Renze Nicolai
@ 2024-04-04 1:17 ` Andrew Jeffery
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Jeffery @ 2024-04-04 1:17 UTC (permalink / raw)
To: Renze Nicolai, linux-arm-kernel, devicetree, linux-kernel,
linux-aspeed, arnd, olof, soc, robh+dt, krzysztof.kozlowski+dt,
joel, andrew
Hi Renze,
In the future, the start of the subject should also include 'aspeed: ',
so:
ARM: dts: aspeed: Modify GPIO table for Asrock X570D4U BMC
On Wed, 2024-04-03 at 15:28 +0200, Renze Nicolai wrote:
> Restructure GPIO table to fit maximum line length.
>
> Fix mistakes found while working on OpenBMC
> userland configuration and based on probing
> the board.
>
> Schematic for this board is not available.
> Because of this the choice was made to
> use a descriptive method for naming the
> GPIOs.
>
> - Push-pull outputs start with output-*
> - Open-drain outputs start with control-*
> - LED outputs start with led-*
> - Inputs start with input-*
> - Button inputs start with button-*
> - Active low signals end with *-n
This seems to be a bit of a mix of following conventions in [1] and
not. It might be helpful to weigh in on that document with your ideas.
[1]: https://github.com/openbmc/docs/blob/master/designs/device-tree-gpio-naming.md
I'll put this series in a tree for Joel for now though, with the
subject fix mentioned above.
I've also re-wrapped the commit messages as it seems you stopped a bit
short of the allowable line length.
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-04 1:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-03 13:28 [PATCH v2 0/3] ARM: dts: Update devicetree of Asrock X570D4U BMC Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 1/3] ARM: dts: Modify GPIO table for " Renze Nicolai
2024-04-04 1:17 ` Andrew Jeffery
2024-04-03 13:28 ` [PATCH v2 2/3] ARM: dts: Disable unused ADC channels " Renze Nicolai
2024-04-03 13:28 ` [PATCH v2 3/3] ARM: dts: Modify I2C bus configuration Renze Nicolai
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).