diff options
author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-02-11 15:15:38 +0200 |
---|---|---|
committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-02-18 13:46:39 +0000 |
commit | a072d9df35b42fac3018e03e4c4bb9177ab94213 (patch) | |
tree | 6731ccfc6940c3d4c664304f384593ab85616a0e /arch/arm/boot/dts/imx6qdl-colibri.dtsi | |
parent | 7362764b2043dacc4700238eec0c8235915c5cb8 (diff) |
ARM: dts: colibri-imx6: rearrange PCAP device nodes
Capacitive TS controllers are parts of peripheral, not boards.
Move all related stuff from board-level to the main module DT.
Prepare the DTs for use with atmel mxt overlays, adding required pinmux
groups.
The common scheme of pin groups for atmel mxt ts:
pinctrl_atmel_conn - uses 107/106 pins for INT/Reset signals;
pinctrl_atmel_adap - uses 28/30 pins for INT/Reset signals.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-colibri.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index e5acc604ddb1..ca4807159892 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -650,6 +650,30 @@ scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: touchscreen@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_atmel_conn>; + reg = <0x4a>; + interrupt-parent = <&gpio2>; + interrupts = <24 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ + reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ + status = "disabled"; + }; + + fusion_f0710a: touchscreen@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_atmel_adap>; + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH /* SODIMM 28, Pen intr */ + &gpio2 10 GPIO_ACTIVE_HIGH /* SODIMM 30, Reset */ + >; + status = "disabled"; + }; }; /* Colibri PWM<B> */ @@ -789,6 +813,26 @@ imx6qdl-colibri { + /* Atmel MXT touchsceen + boards with built-in Capacitive Touch Connector */ + pinctrl_atmel_conn: atmelconnectorgrp { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0xb0b1 /* SODIMM_107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0xb0b1 /* SODIMM_106 */ + >; + }; + + /* Atmel MXT touchsceen + Capacitive Touch Adapter */ + /* NOTE: This pin group conflicts with pin groups + * pinctrl_pwm1/pinctrl_pwm4. Don't enable them + * simultaneously. + */ + pinctrl_atmel_adap: atmeladaptergrp { + fsl,pins = < + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0xb0b1 /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0xb0b1 /* SODIMM 30 */ + >; + }; + /* CSI pins used as GPIO */ pinctrl_csi_gpio_1: csi_gpio-1 { fsl,pins = < @@ -995,7 +1039,7 @@ pinctrl_pwm1: pwm1grp { fsl,pins = < - MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1 + MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1 /* SODIMM 28 */ >; }; @@ -1015,7 +1059,7 @@ pinctrl_pwm4: pwm4grp { fsl,pins = < - MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 + MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1 /* SODIMM 30 */ >; }; |