apalis/colibri dtb: add 3rd pwm parameter to specify pos. neg. logic

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

7 files changed, 35 insertions, 37 deletions

diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
index daa096c769d7..04df1a3bcf66 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
@@ -72,13 +72,13 @@
 		compatible = "pwm-leds";
 		ledpwm2 {
 			label = "PWM<B>";
-			pwms = <&pwm1 0 50000>;
+			pwms = <&pwm1 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm3 {
 			label = "PWM<C>";
-			pwms = <&pwm4 0 50000>;
+			pwms = <&pwm4 0 50000 0>;
 			max-brightness = <255>;
 		};
 	};
@@ -101,15 +101,15 @@
 
 &backlight {
 #if 0 /* PWM polarity: if 1 is brightest */
+	pwms = <&pwm4 0 5000000 0>;
 #if 0 /* Fusion 7 needs 10kHz PWM frequency */
-	pwms = <&pwm3 0 100000>;
+	pwms = <&pwm4 0 100000 0>;
+#endif
+#else /* PWM polarity: if 0 is brightest */
+	pwms = <&pwm4 0 5000000 1>;
 #endif
 	brightness-levels = <0 4 8 16 32 64 128 255>;
 	default-brightness-level = <6>;
-#else /* PWM plarity: if 0 is brightest */
-	brightness-levels = <0 127 191 223 239 247 251 255>;
-	default-brightness-level = <1>;
-#endif
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 8a73ebf7da99..133fa81e2eb8 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -72,19 +72,19 @@
 #ifndef PCAP
 		ledpwm2 {
 			label = "PWM<B>";
-			pwms = <&pwm1 0 50000>;
+			pwms = <&pwm1 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm3 {
 			label = "PWM<C>";
-			pwms = <&pwm4 0 50000>;
+			pwms = <&pwm4 0 50000 0>;
 			max-brightness = <255>;
 		};
 #endif
 		ledpwm4 {
 			label = "PWM<D>";
-			pwms = <&pwm2 0 50000>;
+			pwms = <&pwm2 0 50000 0>;
 			max-brightness = <255>;
 		};
 	};
@@ -98,15 +98,15 @@
 
 &backlight {
 #if 0 /* PWM polarity: if 1 is brightest */
+	pwms = <&pwm4 0 5000000 0>;
 #if 0 /* Fusion 7 needs 10kHz PWM frequency */
-	pwms = <&pwm3 0 100000>;
+	pwms = <&pwm4 0 100000 0>;
+#endif
+#else /* PWM polarity: if 0 is brightest */
+	pwms = <&pwm4 0 5000000 1>;
 #endif
 	brightness-levels = <0 4 8 16 32 64 128 255>;
 	default-brightness-level = <6>;
-#else /* PWM plarity: if 0 is brightest */
-	brightness-levels = <0 127 191 223 239 247 251 255>;
-	default-brightness-level = <1>;
-#endif
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
index 3ea0f9579d11..b647f9981338 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
@@ -51,19 +51,19 @@
 		compatible = "pwm-leds";
 		ledpwm1 {
 			label = "PWM1";
-			pwms = <&pwm1 0 50000>;
+			pwms = <&pwm1 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm2 {
 			label = "PWM2";
-			pwms = <&pwm2 0 50000>;
+			pwms = <&pwm2 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm3 {
 			label = "PWM3";
-			pwms = <&pwm3 0 50000>;
+			pwms = <&pwm3 0 50000 0>;
 			max-brightness = <255>;
 		};
 	};
@@ -120,15 +120,15 @@
 
 &backlight {
 #if 0 /* PWM polarity: if 1 is brightest */
+	pwms = <&pwm4 0 5000000 0>;
 #if 0 /* Fusion 7 needs 10kHz PWM frequency */
-	pwms = <&pwm4 0 100000>;
+	pwms = <&pwm4 0 100000 0>;
+#endif
+#else /* PWM polarity: if 0 is brightest */
+	pwms = <&pwm4 0 5000000 1>;
 #endif
 	brightness-levels = <0 4 8 16 32 64 128 255>;
 	default-brightness-level = <6>;
-#else /* PWM plarity: if 0 is brightest */
-	brightness-levels = <0 127 191 223 239 247 251 255>;
-	default-brightness-level = <1>;
-#endif
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
index 20f2c2e87fe2..58e765b85d61 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
@@ -77,19 +77,19 @@
 		compatible = "pwm-leds";
 		ledpwm1 {
 			label = "PWM1";
-			pwms = <&pwm1 0 50000>;
+			pwms = <&pwm1 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm2 {
 			label = "PWM2";
-			pwms = <&pwm2 0 50000>;
+			pwms = <&pwm2 0 50000 0>;
 			max-brightness = <255>;
 		};
 
 		ledpwm3 {
 			label = "PWM3";
-			pwms = <&pwm3 0 50000>;
+			pwms = <&pwm3 0 50000 0>;
 			max-brightness = <255>;
 		};
 	};
@@ -122,15 +122,15 @@
 
 &backlight {
 #if 0 /* PWM polarity: if 1 is brightest */
+	pwms = <&pwm4 0 5000000 0>;
 #if 0 /* Fusion 7 needs 10kHz PWM frequency */
-	pwms = <&pwm4 0 100000>;
+	pwms = <&pwm4 0 100000 0>;
+#endif
+#else /* PWM polarity: if 0 is brightest */
+	pwms = <&pwm4 0 5000000 1>;
 #endif
 	brightness-levels = <0 4 8 16 32 64 128 255>;
 	default-brightness-level = <6>;
-#else /* PWM plarity: if 0 is brightest */
-	brightness-levels = <0 127 191 223 239 247 251 255>;
-	default-brightness-level = <1>;
-#endif
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index d0f399127ea4..7ed2dd7503a1 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -24,7 +24,6 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm4 0 5000000>;
 		status = "disabled";
 	};
 
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 9d19804ec81f..e50f6bcef029 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -22,7 +22,6 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		pwms = <&pwm3 0 5000000>;
 		status = "disabled";
 	};
 
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 6f1321ccff27..75f2354f1626 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -469,7 +469,7 @@
 			};
 
 			pwm1: pwm@02080000 {
-				#pwm-cells = <2>;
+				#pwm-cells = <3>;
 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
 				reg = <0x02080000 0x4000>;
 				interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -480,7 +480,7 @@
 			};
 
 			pwm2: pwm@02084000 {
-				#pwm-cells = <2>;
+				#pwm-cells = <3>;
 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
 				reg = <0x02084000 0x4000>;
 				interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -491,7 +491,7 @@
 			};
 
 			pwm3: pwm@02088000 {
-				#pwm-cells = <2>;
+				#pwm-cells = <3>;
 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
 				reg = <0x02088000 0x4000>;
 				interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -502,7 +502,7 @@
 			};
 
 			pwm4: pwm@0208c000 {
-				#pwm-cells = <2>;
+				#pwm-cells = <3>;
 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
 				reg = <0x0208c000 0x4000>;
 				interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;