From 18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 20 Nov 2017 21:36:10 +0100 Subject: arm: dts: imx6ull-colibri: enable pwm 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 Acked-by: Stefan Agner --- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 3 +-- arch/arm/boot/dts/imx6ull-colibri.dtsi | 1 - 2 files changed, 1 insertion(+), 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 */ &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"; }; -- cgit v1.2.3