diff options
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 771adef73e46..75ba99148f99 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -118,12 +118,17 @@ scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; status = "okay"; +/* the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm5, pwm6. + so if you enable one of the PCAP controllers disable the pwms */ /* Atmel maxtouch controller */ atmel_mxt_ts: atmel_mxt_ts@4a { compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiotouch>; reg = <0x4a>; - interrupt-parent = <&gpio5>; - interrupts = <4 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpio4>; + interrupts = <16 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ status = "disabled"; }; @@ -265,6 +270,8 @@ }; }; +/* the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm5, pwm6. + so if you enable one of the PCAP controllers disable the pwms */ /* PWM <A> */ &pwm4 { status = "okay"; |