Updated the pinctrl names of the user key and power LED according
to the schematic. Also updated the nodenames of other pinctrls.
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts b/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts
index 4a3ae95f122f..f93b129a0032 100644
--- a/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts
@@ -42,7 +42,7 @@ button-0 {
keys-1 {
compatible = "gpio-keys";
pinctrl-names = "default";
- pinctrl-0 = <&btn_0>;
+ pinctrl-0 = <&pwm15_ir_m1>;
button-1 {
label = "User";
@@ -55,7 +55,7 @@ button-1 {
leds-0 {
compatible = "gpio-leds";
pinctrl-names = "default";
- pinctrl-0 = <&led_0>;
+ pinctrl-0 = <&power_led>;
led-0 {
color = <LED_COLOR_ID_GREEN>;
@@ -306,13 +306,13 @@ &pcie2x1l2 {
&pinctrl {
keys {
- btn_0: button-0 {
+ pwm15_ir_m1: pwm15-ir-m1 {
rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
leds {
- led_0: led-0 {
+ power_led: power-led {
rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -328,19 +328,19 @@ pcie20x1_2_perstn_m0: pcie-2 {
};
regulators {
- vcc_5v0_pwren_h: regulator-5v0-1 {
+ vcc_5v0_pwren_h: vcc-5v0-pwren-h {
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
rtc {
- rtc_int_l: rtc-0 {
+ rtc_int_l: rtc-int-l {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
usb {
- usb_otg_pwren_h: regulator-5v0-0 {
+ usb_otg_pwren_h: usb-otg-pwren-h {
rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
--
2.25.1
Hi Chukun, On 8/16/25 17:00, Chukun Pan wrote: > Updated the pinctrl names of the user key and power LED according > to the schematic. Also updated the nodenames of other pinctrls. > > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> > --- > arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts b/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts > index 4a3ae95f122f..f93b129a0032 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts > @@ -42,7 +42,7 @@ button-0 { > keys-1 { > compatible = "gpio-keys"; > pinctrl-names = "default"; > - pinctrl-0 = <&btn_0>; > + pinctrl-0 = <&pwm15_ir_m1>; > > button-1 { > label = "User"; > @@ -55,7 +55,7 @@ button-1 { > leds-0 { > compatible = "gpio-leds"; > pinctrl-names = "default"; > - pinctrl-0 = <&led_0>; > + pinctrl-0 = <&power_led>; > > led-0 { > color = <LED_COLOR_ID_GREEN>; > @@ -306,13 +306,13 @@ &pcie2x1l2 { > > &pinctrl { > keys { > - btn_0: button-0 { > + pwm15_ir_m1: pwm15-ir-m1 { "The name of a node should be somewhat generic". https://github.com/devicetree-org/devicetree-specification/blob/v0.4/source/chapter2-devicetree-basics.rst?plain=1#L193 https://lore.kernel.org/all/20241216113052.15696-1-naoki@radxa.com/T/#u (I don't understand why this only applies to me...) Best regards, -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. > rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > > leds { > - led_0: led-0 { > + power_led: power-led { > rockchip,pins = <3 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > @@ -328,19 +328,19 @@ pcie20x1_2_perstn_m0: pcie-2 { > }; > > regulators { > - vcc_5v0_pwren_h: regulator-5v0-1 { > + vcc_5v0_pwren_h: vcc-5v0-pwren-h { > rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > > rtc { > - rtc_int_l: rtc-0 { > + rtc_int_l: rtc-int-l { > rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; > }; > }; > > usb { > - usb_otg_pwren_h: regulator-5v0-0 { > + usb_otg_pwren_h: usb-otg-pwren-h { > rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; > }; > };
Hi, > "The name of a node should be somewhat generic". > > https://github.com/devicetree-org/devicetree-specification/blob/v0.4/source/chapter2-devicetree-basics.rst?plain=1#L193 Usually we use the name on the schematic. For example, the patch for e24c: https://lore.kernel.org/lkml/20250727144409.327740-4-jonas@kwiboo.se/ ``` + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&gpio0_a0_user>; ``` If this is incorrect, I will abandon the pinctrl changes for the user key and power LED. > > - vcc_5v0_pwren_h: regulator-5v0-1 { > > - usb_otg_pwren_h: regulator-5v0-0 { But I don't think the above is correct. > https://lore.kernel.org/all/20241216113052.15696-1-naoki@radxa.com/T/#u > > (I don't understand why this only applies to me...) I don't know this. I thought the nodenames of pinctrl and regulator were a bit weird, so I changed the pinctrl's. Thanks, Chukun -- 2.25.1
Hi Chukun, On 8/20/25 00:00, Chukun Pan wrote: > Hi, > >> "The name of a node should be somewhat generic". >> >> https://github.com/devicetree-org/devicetree-specification/blob/v0.4/source/chapter2-devicetree-basics.rst?plain=1#L193 > > Usually we use the name on the schematic. For example, the patch for e24c: I don't mind using names that match the schematic, as long as the device tree maintainer doesn't object. Best regards, -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. > https://lore.kernel.org/lkml/20250727144409.327740-4-jonas@kwiboo.se/ > > ``` > + gpio-keys { > + compatible = "gpio-keys"; > + pinctrl-names = "default"; > + pinctrl-0 = <&gpio0_a0_user>; > ``` > > If this is incorrect, I will abandon the pinctrl changes for > the user key and power LED. > >>> - vcc_5v0_pwren_h: regulator-5v0-1 { >>> - usb_otg_pwren_h: regulator-5v0-0 { > > But I don't think the above is correct. > >> https://lore.kernel.org/all/20241216113052.15696-1-naoki@radxa.com/T/#u >> >> (I don't understand why this only applies to me...) > > I don't know this. I thought the nodenames of pinctrl and regulator > were a bit weird, so I changed the pinctrl's. > > Thanks, > Chukun > > -- > 2.25.1 > > >
© 2016 - 2025 Red Hat, Inc.