summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-12-05 12:57:13 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-21 14:29:29 +0100
commit452982b3a27e092dacbeb65a28fc7698aab378b3 (patch)
treef65edf20eccbd90cdf5209c5c92dc467b07227fb
parentbc68fdefd5e8d0a1a83e3a54e5cbd404a46f6496 (diff)
arm: dts: apalis imx6: add 3rd pwms parameter
The imx pwm driver now support output inversion with a 3rd parameter. While at it move the backlight pwm settings into the carrier board file were it belongs. Period and polarity are carrier board / display dependent. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi2
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis.dtsi1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
index 50831201cca6..9c3f88bbbd68 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
@@ -256,7 +256,7 @@
csi_id = <1>;
mclk = <22000000>;
mclk_source = <0>;
- pwms = <&pwm3 0 45>;
+ pwms = <&pwm3 0 45 0>;
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 52576e9d173b..5f0f447e235e 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -56,7 +56,6 @@
backlight: backlight {
compatible = "pwm-backlight";
- pwms = <&pwm4 0 5000000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio_bl_on>;
enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;