summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerard Salvatella <gerard.salvatella@toradex.com>2018-06-11 16:08:12 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-06-21 11:35:19 +0200
commite456be484f711e97576c0493fc0bfbfbb8425cc5 (patch)
treeb09ffbd532735a7e4325ca1a6eec0ff0c8b9d2b5
parentb8753f648c18aefee460abc00e2e5e2a4c25684c (diff)
dts: update/add atmel mxt
Add mxt nodes to dts and gpio-reset functionality. Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-aster.dts3
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts26
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts1
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi12
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi7
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi1
6 files changed, 36 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
index 3c2d706262f4..ee0569efb711 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
@@ -118,7 +118,8 @@
pinctrl-0 = <&pinctrl_mxt_ts>;
reg = <0x4a>;
interrupt-parent = <&gpio2>;
- interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
+ interrupts = <24 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */
+ reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */
/*
* Note: When the status is set to okay, to avoid pinmux
* conflict, one should remove the pinctrl_weim_cs1 and
diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
index 9114bd175c14..a3f7ccefaede 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
@@ -113,6 +113,25 @@
*/
&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>;
+ reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */
+ /*
+ * 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 */
@@ -204,6 +223,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 */
+ >;
+ };
};
};
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 3e61d141cc1b..17e5d819c496 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -137,6 +137,7 @@
reg = <0x4a>;
interrupt-parent = <&gpio2>;
interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */
/*
* Note: When the status is set to okay, to avoid pinmux
* conflict, one should remove the pinctrl_weim_cs1 and
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
index 4650dc98b997..c06171783e60 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Toradex AG
+ * Copyright 2014-2017 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -47,14 +47,6 @@
};
};
- mxt_reset: mxt-reset {
- compatible = "gpio-reset";
- reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>;
- reset-delay-us = <1>;
- #reset-cells = <0>;
- status = "disabled";
- };
-
v4l2_cap_0 {
compatible = "fsl,imx6q-v4l2-capture";
ipu_id = <0>;
@@ -167,7 +159,7 @@
reg = <0x4a>;
interrupt-parent = <&gpio6>;
interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
- resets = <&mxt_reset>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
status = "disabled";
};
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
index 9b4c65530b7a..26525e24a6c7 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
@@ -159,6 +159,7 @@
reg = <0x4a>;
interrupt-parent = <&gpio6>;
interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
status = "disabled";
};
@@ -166,8 +167,8 @@
/* TouchRevolution Fusion 7 and 10 multi-touch controller */
compatible = "touchrevolution,fusion-f0710a";
reg = <0x10>;
- gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */
- &gpio6 9 0 /* MXM3 13, Reset */
+ gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */
+ &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */
>;
};
@@ -320,7 +321,7 @@
};
&pcie {
- reset-ep-gpio = <&gpio1 28 0>;
+ reset-ep-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
index 91c617a8ef5f..40e4d2e3394f 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
@@ -150,6 +150,7 @@
reg = <0x4a>;
interrupt-parent = <&gpio6>;
interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
status = "disabled";
};