From 523591ef46d84e669341c5b4f5f347531c840d98 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 12 Feb 2021 10:46:43 +0200 Subject: overlays: colibri-imx6: standartize PCAP overlays Add overlays for: - Atmel MXT TS for boards with Capacitive Touch Connector - Atmel MXT TS for Capacitive Touch Adapter Related-to: ELB-3243 Signed-off-by: Oleksandr Suvorov --- overlays/Makefile | 4 +-- overlays/colibri-imx6-aster_atmel-mxt_overlay.dts | 42 ---------------------- overlays/colibri-imx6-eval_atmel-mxt_overlay.dts | 35 ------------------ .../colibri-imx6_atmel-mxt-adapter_overlay.dts | 31 ++++++++++++++++ .../colibri-imx6_atmel-mxt-connector_overlay.dts | 20 +++++++++++ 5 files changed, 53 insertions(+), 79 deletions(-) delete mode 100644 overlays/colibri-imx6-aster_atmel-mxt_overlay.dts delete mode 100644 overlays/colibri-imx6-eval_atmel-mxt_overlay.dts create mode 100644 overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts create mode 100644 overlays/colibri-imx6_atmel-mxt-connector_overlay.dts diff --git a/overlays/Makefile b/overlays/Makefile index 955e63d..13bd5bc 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -28,8 +28,8 @@ dtb-y += apalis-imx6_ov5640-v11a_overlay.dtbo dtb-y += apalis-imx6_parallel-rgb_overlay.dtbo dtb-y += apalis-imx6_stmpe-ts_overlay.dtbo dtb-y += apalis-imx6_vga_overlay.dtbo -dtb-y += colibri-imx6-aster_atmel-mxt_overlay.dtbo -dtb-y += colibri-imx6-eval_atmel-mxt_overlay.dtbo +dtb-y += colibri-imx6_atmel-mxt-adapter_overlay.dtbo +dtb-y += colibri-imx6_atmel-mxt-connector_overlay.dtbo dtb-y += colibri-imx6_hdmi_overlay.dtbo dtb-y += colibri-imx6_parallel-rgb_overlay.dtbo dtb-y += colibri-imx6_stmpe-ts_overlay.dtbo diff --git a/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts b/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts deleted file mode 100644 index cead19e..0000000 --- a/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts +++ /dev/null @@ -1,42 +0,0 @@ -// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board. - -/dts-v1/; -/plugin/; - -#include -#include -#include - -/ { - compatible = "toradex,colibri_imx6dl"; -}; - -&i2c3 { - #address-cells = <1>; - #size-cells = <0>; - - atmel_mxt_ts: atmel_mxt_ts@4a { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_atmel_mxt_ts>; - compatible = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio2>; - interrupts = <24 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; -}; - -&iomuxc { - pinctrl_atmel_mxt_ts: atmelmxttsgrp { - fsl,pins = < - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b1 - MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x1b0b1 - >; - }; -}; - -&weim { - status = "disabled"; -}; - diff --git a/overlays/colibri-imx6-eval_atmel-mxt_overlay.dts b/overlays/colibri-imx6-eval_atmel-mxt_overlay.dts deleted file mode 100644 index fced72c..0000000 --- a/overlays/colibri-imx6-eval_atmel-mxt_overlay.dts +++ /dev/null @@ -1,35 +0,0 @@ -// Atmel touchscreen for the 7inch and 10inch display orderable at Toradex. Use this devicetree on the Evaluation or Iris board. - -/dts-v1/; -/plugin/; - -#include -#include - -/ { - compatible = "toradex,colibri_imx6dl"; - -}; - -&i2c3 { - #address-cells = <1>; - #size-cells = <0>; - - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - reg = <0x4a>; - interrupt-parent = <&gpio1>; - interrupts = <9 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; -}; - -&pwm1 { - status = "disabled"; -}; - -&pwm4_{ - status = "disabled"; -}; - diff --git a/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts new file mode 100644 index 0000000..e235f4d --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts @@ -0,0 +1,31 @@ +// Atmel MXT touchscreen for 7inch and 10inch displays orderable at Toradex. Compatible with a Capacitive Touch Adapter. + +/dts-v1/; +/plugin/; + +#include +#include + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +&atmel_mxt_ts { + pinctrl-0 = <&pinctrl_atmel_adap>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&pwm1 { + status = "disabled"; +}; + +&pwm4 { + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts new file mode 100644 index 0000000..4590e95 --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts @@ -0,0 +1,20 @@ +// Atmel MXT touchscreen for the 7inch and 10inch capacitive displays orderable at Toradex. Compatible with a Capacitive Touch Connector. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&weim { + status = "disabled"; +}; -- cgit v1.2.3