arm64: dts: rockchip: Fix PWM pinctrl names

These Rockchip boards assign "active" as the pinctrl name for PWM
controllers, which has never been supported in mainline Rockchip PWM
driver. It seems the name used by downstream kernel is accidentally
brought into maineline. Let's fix them.

Fixes: 4403e1237be3 ("arm64: dts: rockchip: Add devicetree for board roc-rk3308-cc")
Fixes: 964ed0807b5f ("arm64: dts: rockchip: add rk3318 A95X Z2 board")
Fixes: e7a095908227 ("arm64: dts: rockchip: Add devicetree for NanoPC-T4")
Fixes: 3f5d336d64d6 ("arm64: dts: rockchip: Add support for rk3588s based board Cool Pi 4B")
Signed-off-by: Yao Zi <ziyao@disroot.org>
Link: https://lore.kernel.org/r/20250310140916.14384-2-ziyao@disroot.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
index 629121de5a13d682eeaf202487076bad95a80125..5e71819489920ed66cd324812f25bdeb16892725 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts
@@ -147,7 +147,7 @@
 
 &pwm5 {
        status = "okay";
-       pinctrl-names = "active";
+       pinctrl-names = "default";
        pinctrl-0 = <&pwm5_pin_pull_down>;
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
index a94114fb7cc1d1635e1148575e1ebf6801f802ab..96c27fc5005d1f11b9426629896a29726905d1eb 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
@@ -274,13 +274,13 @@
 
 &pwm0 {
        pinctrl-0 = <&pwm0_pin_pull_up>;
-       pinctrl-names = "active";
+       pinctrl-names = "default";
        status = "okay";
 };
 
 &pwm1 {
        pinctrl-0 = <&pwm1_pin_pull_up>;
-       pinctrl-names = "active";
+       pinctrl-names = "default";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index b169be06d4d1f79fbdef9e550acac8d829aede39..c8eb5481f43d020853a3ba89515303e3e440c2f4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -603,7 +603,7 @@
 };
 
 &pwm2 {
-       pinctrl-names = "active";
+       pinctrl-names = "default";
        pinctrl-0 = <&pwm2_pin_pull_down>;
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
index 8f00e0444c009c6cb09fcca5b4c8e7a3965670be..8b717c4017a46ac658a6a105519770c3e6e881ee 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts
@@ -433,7 +433,7 @@
 };
 
 &pwm13 {
-       pinctrl-names = "active";
+       pinctrl-names = "default";
        pinctrl-0 = <&pwm13m2_pins>;
        status = "okay";
 };