diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-02-20 12:47:46 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-04-01 12:13:50 +0300 |
| commit | 59d5bd61f7e9f5f16f3413cb361b880f6d64fee6 (patch) | |
| tree | ba0840d5d6467190c599db30a060ea43e1f8f168 /arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | |
| parent | ccd223d87ae20e16f6260be8bdfdab9e6a2ba21c (diff) | |
ARM: dts: colibri-imx6ull: add touchscreen device nodes
Move all atmel and fusion touchscreen nodes 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 TS overlays:
- pinctrl_atmel_conn - SODIMM 106/107 pins for INT/RST (default)
- pinctrl_atmel_adap - SODIMM 28/30 pins for INT/RST signals.
Related-to: ELB-3868
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi index 1f776b96e383..f91793344d0f 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -86,18 +86,6 @@ scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; - /* 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>; /* SODIMM 107 */ - reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ - status = "okay"; - }; - /* M41T0M6 real time clock on carrier board */ rtc: m41t0m6@68 { compatible = "st,m41t0"; @@ -112,14 +100,12 @@ /* PWM <B> */ &pwm5 { - /* Pin already used by atmel_mxt_ts touchscreen */ - status = "disabled"; + status = "okay"; }; /* PWM <C> */ &pwm6 { - /* Pin already used by atmel_mxt_ts touchscreen */ - status = "disabled"; + status = "okay"; }; /* PWM <D> */ @@ -127,6 +113,11 @@ status = "okay"; }; +/* Atmel TS connector */ +&atmel_mxt_ts { + status = "okay"; +}; + /* Colibri UART_A */ &uart1 { status = "okay"; @@ -215,13 +206,3 @@ }; }; -&iomuxc { - imx6ull-colibri { - pinctrl_gpiotouch: touchgpios { - fsl,pins = < - MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x74 - MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0x14 - >; - }; - }; -}; |