Skip to content

Commit 09b0a7b

Browse files
ziyao233mmind
authored andcommitted
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: 4403e12 ("arm64: dts: rockchip: Add devicetree for board roc-rk3308-cc") Fixes: 964ed08 ("arm64: dts: rockchip: add rk3318 A95X Z2 board") Fixes: e7a0959 ("arm64: dts: rockchip: Add devicetree for NanoPC-T4") Fixes: 3f5d336 ("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>
1 parent b5cb721 commit 09b0a7b

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147

148148
&pwm5 {
149149
status = "okay";
150-
pinctrl-names = "active";
150+
pinctrl-names = "default";
151151
pinctrl-0 = <&pwm5_pin_pull_down>;
152152
};
153153

arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@
274274

275275
&pwm0 {
276276
pinctrl-0 = <&pwm0_pin_pull_up>;
277-
pinctrl-names = "active";
277+
pinctrl-names = "default";
278278
status = "okay";
279279
};
280280

281281
&pwm1 {
282282
pinctrl-0 = <&pwm1_pin_pull_up>;
283-
pinctrl-names = "active";
283+
pinctrl-names = "default";
284284
status = "okay";
285285
};
286286

arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@
603603
};
604604

605605
&pwm2 {
606-
pinctrl-names = "active";
606+
pinctrl-names = "default";
607607
pinctrl-0 = <&pwm2_pin_pull_down>;
608608
status = "okay";
609609
};

arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
};
434434

435435
&pwm13 {
436-
pinctrl-names = "active";
436+
pinctrl-names = "default";
437437
pinctrl-0 = <&pwm13m2_pins>;
438438
status = "okay";
439439
};

0 commit comments

Comments
 (0)