diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri.dtsi | 21 |
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 { |