summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--overlays/Makefile6
-rw-r--r--overlays/colibri-imx7-aster_atmel-mxt_overlay.dts31
-rw-r--r--overlays/colibri-imx7-eval_atmel-mxt_overlay.dts51
-rw-r--r--overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts42
-rw-r--r--overlays/colibri-imx7_atmel-mxt-connector_overlay.dts28
-rw-r--r--overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts36
-rw-r--r--overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts33
7 files changed, 143 insertions, 84 deletions
diff --git a/overlays/Makefile b/overlays/Makefile
index b1bd13e..50798cc 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -48,8 +48,10 @@ dtb-y += colibri-imx6_lcd-lt170410_overlay.dtbo
dtb-y += colibri-imx6_stmpe-ts_overlay.dtbo
dtb-y += colibri-imx6_lcd-vga_overlay.dtbo
dtb-y += colibri-imx7_ad7879_overlay.dtbo
-dtb-y += colibri-imx7-aster_atmel-mxt_overlay.dtbo
-dtb-y += colibri-imx7-eval_atmel-mxt_overlay.dtbo
+dtb-y += colibri-imx7_atmel-mxt-adapter_overlay.dtbo
+dtb-y += colibri-imx7_atmel-mxt-connector_overlay.dtbo
+dtb-y += colibri-imx7_fusion-f0710a-adapter_overlay.dtbo
+dtb-y += colibri-imx7_fusion-f0710a-connector_overlay.dtbo
dtb-y += colibri-imx7-eval_spidev_overlay.dtbo
dtb-y += colibri-imx7_lcd-lt161010_overlay.dtbo
dtb-y += colibri-imx8x-eval_spidev_overlay.dtbo
diff --git a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts b/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts
deleted file mode 100644
index aecff18..0000000
--- a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2020-2021 Toradex
- */
-
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
-
-/dts-v1/;
-/plugin/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
- compatible = "toradex,colibri-imx7d",
- "toradex,colibri-imx7d-emmc";
-};
-
-&i2c4 {
- #address-cells = <1>;
- #size-cells = <0>;
-
- atmel_mxt_ts: atmel_mxt_ts@4a {
- compatible = "atmel,maxtouch";
- reg = <0x4a>;
- interrupt-parent = <&gpio2>;
- interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
- reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-};
diff --git a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
deleted file mode 100644
index 29f4fcf..0000000
--- a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2020-2021 Toradex
- */
-
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
-
-/dts-v1/;
-/plugin/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <imx7d-pinfunc.h>
-
-/ {
- compatible = "toradex,colibri-imx7d",
- "toradex,colibri-imx7d-emmc";
-};
-
-&i2c4 {
- #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 = <&gpio1>;
- interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
- reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
- status = "okay";
- };
-};
-
-&iomuxc {
- pinctrl_atmel_mxt_ts: atmelmxttsgrp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x59
- MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x59
- >;
- };
-};
-
-&pwm2 {
- status = "disabled";
-};
-
-&pwm3 {
- status = "disabled";
-};
diff --git a/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
new file mode 100644
index 0000000..58f85dd
--- /dev/null
+++ b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ compatible = "toradex,colibri-imx7d",
+ "toradex,colibri-imx7s",
+ "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+ pinctrl-0 = <&pinctrl_atmel_adapter>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+};
+
+&fusion_f0710a {
+ status = "disabled";
+};
+
+&pwm2 {
+ status = "disabled";
+};
+
+&pwm3 {
+ status = "disabled";
+};
diff --git a/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
new file mode 100644
index 0000000..fd09c8b
--- /dev/null
+++ b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
+
+/dts-v1/;
+/plugin/;
+
+
+/ {
+ compatible = "toradex,colibri-imx7d",
+ "toradex,colibri-imx7s",
+ "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+ status = "okay";
+};
+
+&fusion_f0710a {
+ status = "disabled";
+};
+
+&i2c4 {
+ status = "okay";
+};
diff --git a/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts b/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts
new file mode 100644
index 0000000..362314f
--- /dev/null
+++ b/overlays/colibri-imx7_fusion-f0710a-adapter_overlay.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Fusion F0710A touchscreen. Compatible with a Capacitive Touch Adapter.
+
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "toradex,colibri-imx7d",
+ "toradex,colibri-imx7s",
+ "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+ status = "disabled";
+};
+
+&fusion_f0710a {
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+};
+
+&pwm2 {
+ status = "disabled";
+};
+
+&pwm3 {
+ status = "disabled";
+};
+
diff --git a/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts b/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts
new file mode 100644
index 0000000..5506fce
--- /dev/null
+++ b/overlays/colibri-imx7_fusion-f0710a-connector_overlay.dts
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Fusion F0710A touchscreen. Compatible with a Capacitive Touch Connector.
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ compatible = "toradex,colibri-imx7d",
+ "toradex,colibri-imx7s",
+ "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+ status = "disabled";
+};
+
+&fusion_f0710a {
+ pinctrl-0 = <&pinctrl_atmel_connector>;
+ gpios = <&gpio2 15 GPIO_ACTIVE_HIGH /* SODIMM 107, INT */
+ &gpio2 28 GPIO_ACTIVE_LOW /* SODIMM 106, RST */
+ >;
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+};