summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-09-06 20:21:17 -0700
committerStefan Agner <stefan.agner@toradex.com>2015-09-06 20:21:17 -0700
commitfbe57972b2847a51dc8660816a79e1df7ec49938 (patch)
treeb20789daa4ba01a9cc54a9cf2e375e7bb212a08b /arch/arm/boot/dts
parent326879dda277c0b85f64bf66e071745b63c0f658 (diff)
ARM: dts: vf610-colibri: fix standard pinmux of PWM channels
With dfe965e29281 ("ARM: dts: vf610-colibri: add TouchRevolution multitouch controller") pinmux of the PWM channels PWM_B and PWM_C has been overwritten unintentionally. Remove the carrier board level PWM pinmuxing to restore the Colibri standard pinmux provided by vf-colibri.dtsi.
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/vf-colibri-eval-v3.dtsi2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
index 4fe25a11c1f3..01ceecacbecf 100644
--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
@@ -232,12 +232,10 @@
&pwm0 {
status = "okay";
- pinctrl-0 = <&pinctrl_pwm0_a>;
};
&pwm1 {
status = "okay";
- pinctrl-0 = <&pinctrl_pwm1_d>;
};
&tcon0 {