diff options
author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-10-19 14:56:04 +0300 |
---|---|---|
committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2020-10-19 14:56:04 +0300 |
commit | 3b0f3a9cd375b545f680f2292e56cd5c76daf97e (patch) | |
tree | 4cb78ae2587a73fbe6b920f702e9f71949e6206c /arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | |
parent | ea3a4dce2167aeb034dfb2306f1d98e15b9be9ff (diff) |
arm: dts: imx6dl-colibri: remove duplicated atmel mxt
The node atmel_mxt_ts claims in the overlay file. Remove the node
there to avoid a conflict.
Related-to: ELB-2943
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index a42629190de3..13deded6aa84 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -154,18 +154,6 @@ &i2c3 { status = "okay"; - /* Atmel maxtouch controller */ - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcap_1>; - reg = <0x4a>; - interrupt-parent = <&gpio1>; - interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ - reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ - status = "disabled"; - }; - /* * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm1, * pwm4. So if you enable one of the PCAP controllers disable the pwms. @@ -208,13 +196,6 @@ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */ >; }; - - pinctrl_mxt_ts: mxt-ts { - fsl,pins = < - MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */ - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */ - >; - }; }; }; |