Merge pull request radxa-pkg#291 from Ken-Vamrs/main

update rk3588-pwm1-m2 compatible and rock 5b+ display brightness-levels
RadxaStephen · Apr 10, 2024 · bbab7c9 · bbab7c9
2 parents 888dc08 + 9fe0b55
commit bbab7c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3588-pwm1-m2.dts
@@ -4,7 +4,7 @@
 / {
 	metadata {
 		title = "Enable PWM1-M2";
-		compatible = "radxa,rock-5a", "radxa,rock-5b-plus", "radxa,rock-5c";
+		compatible = "radxa,rock-5a", "radxa,rock-5c";
 		category = "misc";
 		exclusive = "GPIO1_A3";
 		description = "Enable PWM1-M2.\nOn Radxa ROCK 5A this is pin 24.";

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10fhd.dts
@@ -5,6 +5,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/display/drm_mipi_dsi.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	metadata {
@@ -35,7 +36,7 @@
 			dsi1_backlight: dsi1-backlight {
 				status = "okay";
 				compatible = "pwm-backlight";
-				pwms = <&pwm2 0 25000 0>;
+				pwms = <&pwm2 0 25000 PWM_POLARITY_INVERTED>;
 				brightness-levels = <
 					0  20  20  21  21  22  22  23
 					23  24  24  25  25  26  26  27

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-10hd.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	metadata {
@@ -33,7 +34,7 @@
 			dsi1_backlight: dsi1-backlight {
 				status = "okay";
 				compatible = "pwm-backlight";
-				pwms = <&pwm2 0 25000 0>;
+				pwms = <&pwm2 0 25000 PWM_POLARITY_INVERTED>;
 				brightness-levels = <
 					0  20  20  21  21  22  22  23
 					23  24  24  25  25  26  26  27

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-plus-radxa-display-8hd.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	metadata {
@@ -33,7 +34,7 @@
 			dsi1_backlight: dsi1-backlight {
 				status = "okay";
 				compatible = "pwm-backlight";
-				pwms = <&pwm2 0 25000 0>;
+				pwms = <&pwm2 0 25000 PWM_POLARITY_INVERTED>;
 				brightness-levels = <
 					0  20  20  21  21  22  22  23
 					23  24  24  25  25  26  26  27