diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-10-15 14:02:53 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:11:54 +0100 |
| commit | c3b5461b499a103874e8a210e9c82f132a50207a (patch) | |
| tree | faedba38793ff7e2f252b56ba72a4d9e90c7719d /arch | |
| parent | af9c2bc1c8ff0853abe975bb13da9935029c7771 (diff) | |
imx6dl-colibri-eval-v3.dts: prepare for fusion_F07/10A
Prepare for the needed changes to use the capacitive touch controller
on Fusion F07, Fusion F10A displays.
In order to use it uncomment the define PCAP and recompile and deploy
the device tree
Forward port of 3.10.17, commit e5925f53b4c6021d03a7a694d0512712036e83e6
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 7c8321f185737c5b9d88aa5846b26e8939372969)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 9d4dd5180482..96db16920544 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -18,6 +18,10 @@ #include "imx6dl.dtsi" #include "imx6qdl-colibri.dtsi" +/* Add the following define if you connect a Fusion display with a capacitive + touch controller */ +/* #define PCAP */ + / { model = "Toradex Colibri iMX6DL/S on Colibri Evaluation Board V3"; compatible = "toradex,colibri_imx6dl-eval", "toradex,colibri_imx6dl", "fsl,imx6dl"; @@ -65,6 +69,7 @@ pwmleds { compatible = "pwm-leds"; +#ifndef PCAP ledpwm2 { label = "PWM<B>"; pwms = <&pwm1 0 50000>; @@ -76,7 +81,7 @@ pwms = <&pwm4 0 50000>; max-brightness = <255>; }; - +#endif ledpwm4 { label = "PWM<D>"; pwms = <&pwm2 0 50000>; @@ -134,11 +139,13 @@ */ &i2c3 { status = "okay"; -#if 0 /* not standard pinout, disable PWM<B>, PWM<C> +#ifdef PCAP /* not standard pinout, disable PWM<B>, PWM<C> */ pcap@10 { /* TouchRevolution Fusion 7 and 10 multi-touch controller */ compatible = "touchrevolution,fusion-f0710a"; reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; gpios = <&gpio1 9 0 /* SODIMM 28, Pen down interrupt */ &gpio2 10 0 /* SODIMM 30, Reset */ >; @@ -175,6 +182,15 @@ &pinctrl_csi_gpio_1 &pinctrl_gpio_1 &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1>; + + gpio { + pinctrl_pcap_1: pcap-1 { + fsl,pins = < + MX6QDL_PAD_GPIO_9__GPIO1_IO09 PAD_CTRL_HYS_PD /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 PAD_CTRL_HYS_PD /* SODIMM 30 */ + >; + }; + }; }; &lcd { @@ -189,9 +205,11 @@ status = "okay"; }; +#ifndef PCAP &pwm1 { status = "okay"; }; +#endif &pwm2 { status = "okay"; @@ -201,9 +219,11 @@ status = "okay"; }; +#ifndef PCAP &pwm4 { status = "okay"; }; +#endif &sound_hdmi { status = "okay"; |