From d645c53eb54dc92c8f61267961e2a42166aae052 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 11 Feb 2021 15:42:02 +0200 Subject: overlays: colibri-imx6: full set of PCAP overlays Add overlays for: - Atmel MXT TS for boards with Capacitive Touch Connector - Atmel MXT TS for Capacitive Touch Adapter - Fusion F0710A TS for boards with Capacitive Touch Connector - Fusion F0710A TS for Capacitive Touch Adapter Related-to: ELB-3243 Signed-off-by: Oleksandr Suvorov --- overlays/Makefile | 6 ++-- 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 | 35 ++++++++++++++++++ .../colibri-imx6_atmel-mxt-connector_overlay.dts | 24 +++++++++++++ .../colibri-imx6_fusion-f0710a-adapter_overlay.dts | 28 +++++++++++++++ ...olibri-imx6_fusion-f0710a-connector_overlay.dts | 30 ++++++++++++++++ 7 files changed, 121 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 create mode 100644 overlays/colibri-imx6_fusion-f0710a-adapter_overlay.dts create mode 100644 overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts diff --git a/overlays/Makefile b/overlays/Makefile index 9bda199..b1bd13e 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -37,9 +37,11 @@ dtb-y += apalis-imx8x_atmel-mxt_overlay.dtbo dtb-y += apalis-imx8x_dsihdmi_overlay.dtbo dtb-y += apalis-imx8x_lvds_overlay.dtbo dtb-y += apalis-imx8x_parallel-rgb_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-eval_spidev_overlay.dtbo +dtb-y += colibri-imx6_fusion-f0710a-adapter_overlay.dtbo +dtb-y += colibri-imx6_fusion-f0710a-connector_overlay.dtbo dtb-y += colibri-imx6_hdmi_overlay.dtbo dtb-y += colibri-imx6_lcd-lt161010_overlay.dtbo dtb-y += colibri-imx6_lcd-lt170410_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 6b76b74..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>; - }; -}; - -&iomuxc { - gpio { - pinctrl_atmel_mxt_ts: atmelmxttsgrp { - fsl,pins = < - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b1 /* SODIMM_106 */ - MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b1 /* SODIMM_107 */ - >; - }; - }; -}; - -&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 3e31803..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 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>; - reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; - }; -}; - -&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..bcdeace --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-adapter_overlay.dts @@ -0,0 +1,35 @@ +// Atmel MXT touchscreen for the 7inch and 10inch display 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"; +}; + +&fusion_f0710a { + status = "disabled"; +}; + +&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..a99273f --- /dev/null +++ b/overlays/colibri-imx6_atmel-mxt-connector_overlay.dts @@ -0,0 +1,24 @@ +// Atmel touchscreen for the 7inch and 10inch capacitive display orderable at Toradex. Compatible with a Capacitive Touch Connector. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&fusion_f0710a { + status = "disabled"; +}; + +&i2c3 { + status = "okay"; +}; + +&weim { + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_fusion-f0710a-adapter_overlay.dts b/overlays/colibri-imx6_fusion-f0710a-adapter_overlay.dts new file mode 100644 index 0000000..a24a414 --- /dev/null +++ b/overlays/colibri-imx6_fusion-f0710a-adapter_overlay.dts @@ -0,0 +1,28 @@ +// Fusion F0710A touchscreen. Compatible with a Capacitive Touch Adapter. + +/dts-v1/; +/plugin/; + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +&atmel_mxt_ts { + status = "disabled"; +}; + +&fusion_f0710a { + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&pwm1 { + status = "disabled"; +}; + +&pwm4{ + status = "disabled"; +}; diff --git a/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts b/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts new file mode 100644 index 0000000..b2594a8 --- /dev/null +++ b/overlays/colibri-imx6_fusion-f0710a-connector_overlay.dts @@ -0,0 +1,30 @@ +// Fusion F0710A touchscreen. Compatible with a Capacitive Touch Connector. + +/dts-v1/; +/plugin/; + +#include + +/ { + compatible = "toradex,colibri_imx6dl"; +}; + +&atmel_mxt_ts { + status = "disabled"; +}; + +&fusion_f0710a { + pinctrl-0 = <&pinctrl_atmel_conn>; + gpios = <&gpio2 24 GPIO_ACTIVE_HIGH /* SODIMM 107, Pen intr */ + &gpio1 14 GPIO_ACTIVE_HIGH /* SODIMM 106, Reset */ + >; + status = "okay"; +}; + +&i2c3 { + status = "okay"; +}; + +&weim { + status = "disabled"; +}; -- cgit v1.2.3