Merge pull request radxa-pkg#331 from Radxa-Alvin/main

feat: add radxa cm3j rpi cm4 io 40 pin pwm overlay
nascs · Jun 17, 2024 · 0477176 · 0477176
2 parents 13772a2 + 2b47513
commit 0477176
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 10 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile
@@ -382,8 +382,10 @@ dtb-$(CONFIG_CLK_RK3588) += \
 	rk3588-pwm7-m2.dtbo \
 	rk3588-pwm7-m3.dtbo \
 	rk3588-pwm8-m0.dtbo \
+	rk3568-pwm10-m0.dtbo \
 	rk3588-pwm10-m2.dtbo \
 	rk3588-pwm11-m1.dtbo \
+	rk3568-pwm11-m0.dtbo \
 	rk3588-pwm11-m2.dtbo \
 	rk3588-pwm12-m0.dtbo \
 	rk3588-pwm12-m1.dtbo \

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm10-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm10-m0.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable PWM10-M0";
+		compatible = "radxa,cm3j-rpi-cm4-io";
+		category = "misc";
+		exclusive = "GPIO3_B5";
+		description = "Enable PWM10-M0.
+On Radxa CM3J RPI CM4 IO this is pin 5.
+";
+	};
+};
+
+&pwm10 {
+	status = "okay";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm10m0_pins>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm11-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm11-m0.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	metadata {
+		title = "Enable PWM11-M0";
+		compatible = "radxa,cm3j-rpi-cm4-io";
+		category = "misc";
+		exclusive = "GPIO3_B6", "pwm11";
+		description = "Enable PWM11-M0.
+On Radxa CM3J RPI CM4 IO this is pin 3.
+";
+	};
+};
+
+&pwm11 {
+	status = "okay";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm11m0_pins>;
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm12-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm12-m0.dts
@@ -4,11 +4,12 @@
 / {
 	metadata {
 		title = "Enable PWM12-M0";
-		compatible = "unknown";
+		compatible = "radxa,cm3j-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO3_B7";
 		description = "Enable PWM12-M0.
-On Radxa ROCK 3A <= v1.2 this is pin 7.";
+On Radxa CM3J RPI CM4 IO this is pin 32.
+";
 	};
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm13-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm13-m0.dts
@@ -4,12 +4,14 @@
 / {
 	metadata {
 		title = "Enable PWM13-M0";
-		compatible = "radxa,e25";
+		compatible = "radxa,e25", "radxa,cm3j-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO3_C0";
 		description = "Enable PWM13-M0.
 On Radxa ROCK 3A <= v1.2 this is pin 37.
-On Radxa E25 this is pin 26";
+On Radxa E25 this is pin 26.
+On Radxa CM3J RPI CM4 IO this is pin 15.
+";
 	};
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm15-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm15-m0.dts
@@ -4,14 +4,16 @@
 / {
 	metadata {
 		title = "Enable PWM15-M0";
-		compatible = "radxa,rock-3a", "radxa,rock-3b", "radxa,e25";
+		compatible = "radxa,rock-3a", "radxa,rock-3b", "radxa,e25", "radxa,cm3j-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO3_C5";
 		description = "Enable PWM15-M0.
 On Radxa ROCK 3A <= v1.2 this is pin 13.
 On Radxa ROCK 3A >= v1.3 this is pin 13.
 On Radxa ROCK 3B this is pin 13.
-On Radxa E25 this is pin 13.";
+On Radxa E25 this is pin 13.
+On Radxa CM3J RPI CM4 IO this is pin 37.
+";
 	};
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm8-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm8-m0.dts
@@ -4,12 +4,14 @@
 / {
 	metadata {
 		title = "Enable PWM8-M0";
-		compatible = "radxa,rock-3c", "radxa,zero3";
+		compatible = "radxa,rock-3c", "radxa,zero3", "radxa,cm3j-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO3_B1";
 		description = "Enable PWM8-M0.
 On Radxa ROCK 3C this is pin 16.
-On Radxa ZERO 3 this is pin 16.";
+On Radxa ZERO 3 this is pin 16.
+On Radxa CM3J RPI CM4 IO this is pin 13.
+";
 	};
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm9-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3568-pwm9-m0.dts
@@ -4,15 +4,17 @@
 / {
 	metadata {
 		title = "Enable PWM9-M0";
-		compatible = "radxa,rock-3a", "radxa,rock-3b", "radxa,rock-3c", "radxa,zero3";
+		compatible = "radxa,rock-3a", "radxa,rock-3b", "radxa,rock-3c", "radxa,zero3", "radxa,cm3j-rpi-cm4-io";
 		category = "misc";
 		exclusive = "GPIO3_B2";
 		description = "Enable PWM9-M0.
 On Radxa ROCK 3A <= v1.2 this is pin 18.
 On Radxa ROCK 3A >= v1.3 this is pin 18.
 On Radxa ROCK 3B this is pin 18.
 On Radxa ROCK 3C this is pin 18.
-On Radxa ZERO 3 this is pin 18.";
+On Radxa ZERO 3 this is pin 18.
+On Radxa CM3J RPI CM4 IO this is pin 11.
+";
 	};
 };