diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-11-20 21:36:10 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-11-27 10:13:04 +0100 |
| commit | 18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114 (patch) | |
| tree | 92cdfebb73810252902929ea26f33aedd6322b1e | |
| parent | 6863695b931ae31fe20171e75cf8a57c990873be (diff) | |
arm: dts: imx6ull-colibri: enable pwmColibri-iMX6ULL_LXDE-Image_2.7b5-20171201
Now that the PWM work enable them.
While at it move the backlight pwm settings into the carrier board
file were it belongs. Periode and polarity are carrier board / display
dependent.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri.dtsi | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 4009de5d2fb6..38bf45a4876b 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -75,6 +75,7 @@ &bl { brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + pwms = <&pwm4 0 5000000 1>; status = "okay"; }; @@ -275,7 +276,6 @@ }; }; -#if 0 /* PWM <A> */ &pwm4 { status = "okay"; @@ -295,7 +295,6 @@ &pwm7 { status = "okay"; }; -#endif &uart1 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 432b3ab0a1a0..4ed695f39a25 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -43,7 +43,6 @@ compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - pwms = <&pwm4 0 5000000 0>; enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; status = "disabled"; }; |