diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-aster.dts | 24 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 25 |
2 files changed, 49 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts index b17c089a3120..ff112e6c1efd 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts @@ -110,6 +110,23 @@ &i2c3 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mxt_ts>; + reg = <0x4a>; + interrupt-parent = <&gpio2>; + interrupts = <24 IRQ_TYPE_EDGE_FALLING>; + /* + * Note: When the status is set to okay, to avoid pinmux + * conflict, one should remove the pinctrl_weim_cs1 and + * pinctrl_weim_cs2 pingroup from the weim pinctrl-0 + * property or disable weim node. + */ + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; @@ -140,6 +157,13 @@ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 PAD_CTRL_HYS_PU /* SODIMM 30 */ >; }; + + pinctrl_mxt_ts: mxt-ts { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 PAD_CTRL_HYS_PD /* SODIMM 107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 PAD_CTRL_HYS_PD /* SODIMM 106 */ + >; + }; }; }; diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 346b93e438dc..934d5927fbee 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -140,6 +140,24 @@ */ &i2c3 { status = "okay"; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mxt_ts>; + reg = <0x4a>; + interrupt-parent = <&gpio2>; + interrupts = <24 IRQ_TYPE_EDGE_FALLING>; + /* + * Note: When the status is set to okay, to avoid pinmux + * conflict, one should remove the pinctrl_weim_cs1 and + * pinctrl_weim_cs2 pingroup from the weim pinctrl-0 + * property or disable weim node. + */ + status = "disabled"; + }; + #ifdef PCAP /* not standard pinout, disable PWM<B>, PWM<C> */ pcap@10 { /* TouchRevolution Fusion 7 and 10 multi-touch controller */ @@ -192,6 +210,13 @@ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 PAD_CTRL_HYS_PD /* SODIMM 30 */ >; }; + + pinctrl_mxt_ts: mxt-ts { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 PAD_CTRL_HYS_PD /* SODIMM 107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 PAD_CTRL_HYS_PD /* SODIMM 106 */ + >; + }; }; }; |