summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi3
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi1
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";
};