summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-09-21 21:52:17 +0200
committerStefan Agner <stefan.agner@toradex.com>2017-10-02 16:43:53 +0200
commit9655d3bcb5e84d1cef542cd70d0281d5bec20b66 (patch)
tree5e3a2d4824856613777b018b24b6845432cc21e0 /arch/arm/boot
parentbce5146373372651052654b84cd3b773ac4d1882 (diff)
imx6ull-colibri dtb: disable all pwm
They currently don't work. Activating them from the sysfs does freeze the kernel. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi21
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
index 6b94167e1497..35c9cfc55597 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
@@ -273,6 +273,7 @@
};
};
+#if 0
/* PWM <A> */
&pwm4 {
status = "okay";
@@ -292,6 +293,7 @@
&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 aad9c4eeadcf..d47de46a35f6 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -42,6 +42,7 @@
pinctrl-0 = <&pinctrl_gpio_bl_on>;
pwms = <&pwm4 0 5000000 0>;
enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+ status = "disabled";
};
pxp_v4l2_out {
@@ -181,24 +182,44 @@
&pinctrl_lcdif_ctrl>;
};
+&pwm1 {
+ status = "disabled";
+};
+
+&pwm2 {
+ status = "disabled";
+};
+
+&pwm3 {
+ status = "disabled";
+};
+
&pwm4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm4>;
+ status = "disabled";
};
&pwm5 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm5>;
+ status = "disabled";
};
&pwm6 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm6>;
+ status = "disabled";
};
&pwm7 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm7>;
+ status = "disabled";
+};
+
+&pwm8 {
+ status = "disabled";
};
&iomuxc {