From: Philippe Schenker <philippe.schenker@toradex.com>
To: "Marcel Ziswiler" <marcel.ziswiler@toradex.com>,
"Max Krummenacher" <max.krummenacher@toradex.com>,
"stefan@agner.ch" <stefan@agner.ch>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Shawn Guo" <shawnguo@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Michal Vokáč" <michal.vokac@ysoft.com>,
"Fabio Estevam" <festevam@gmail.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
NXP Linux Team <linux-imx@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v4 12/21] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards
Date: Mon, 12 Aug 2019 14:21:33 +0000 [thread overview]
Message-ID: <20190812142105.1995-13-philippe.schenker@toradex.com> (raw)
In-Reply-To: <20190812142105.1995-1-philippe.schenker@toradex.com>
This commit adds the touchscreens from Toradex so one can enable it.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v4:
- Add Marcel Ziswiler's Ack
Changes in v3:
- Fix commit title to "...imx6-apalis:..."
Changes in v2:
- Deleted touchrevolution downstream stuff
- Use generic node name
- Put a better comment in there
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 31 +++++++++++++++++++
arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 ++++++++
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 ++++++++
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 ++++++++
4 files changed, 70 insertions(+)
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 9a5d6c94cca4..763fb5e90bd3 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -168,6 +168,21 @@
&i2c3 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@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";
+ };
+
/* M41T0M6 real time clock on carrier board */
rtc_i2c: rtc@68 {
compatible = "st,m41t0";
@@ -175,6 +190,22 @@
};
};
+&iomuxc {
+ pinctrl_pcap_1: pcap-1 {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */
+ 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 */
+ >;
+ };
+};
+
&ipu1_di0_disp0 {
remote-endpoint = <&lcd_display_in>;
};
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 0edd3043d9c1..4665e15b196d 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -167,6 +167,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
pcie-switch@58 {
compatible = "plx,pex8605";
reg = <0x58>;
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index b94bb687be6b..a3fa04a97d81 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -172,6 +172,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
/* M41T0M6 real time clock on carrier board */
rtc_i2c: rtc@68 {
compatible = "st,m41t0";
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 302fd6adc8a7..5ba49d0f4880 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -171,6 +171,19 @@
&i2c1 {
status = "okay";
+ /*
+ * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
+ * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
+ */
+ touchscreen@4a {
+ compatible = "atmel,maxtouch";
+ reg = <0x4a>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+ reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ status = "disabled";
+ };
+
eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
--
2.22.0
next prev parent reply other threads:[~2019-08-12 14:22 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 14:21 [PATCH v4 00/21] Common patches from downstream development Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 01/21] ARM: dts: imx7-colibri: make sure module supplies are always on Philippe Schenker
2019-08-19 10:58 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 02/21] ARM: dts: imx7-colibri: disable HS400 Philippe Schenker
2019-08-15 13:52 ` Oleksandr Suvorov
2019-08-19 11:06 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 03/21] ARM: dts: imx7-colibri: prepare module device tree for FlexCAN Philippe Schenker
2019-08-19 11:09 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 04/21] ARM: dts: imx7-colibri: Add sleep mode to ethernet Philippe Schenker
2019-08-19 11:12 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 05/21] ARM: dts: imx7-colibri: add recovery for I2C for iMX7 Philippe Schenker
2019-08-19 11:14 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 06/21] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
2019-08-19 11:17 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 07/21] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker
2019-08-19 11:18 ` Shawn Guo
2019-08-21 12:49 ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 08/21] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
2019-08-15 10:59 ` Oleksandr Suvorov
2019-08-19 11:21 ` Shawn Guo
2019-08-21 12:51 ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 09/21] ARM: dts: imx6qdl-colibri: add phy to fec Philippe Schenker
2019-08-19 11:22 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 10/21] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
2019-08-19 11:25 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 11/21] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces Philippe Schenker
2019-08-19 11:27 ` Shawn Guo
2019-08-21 13:15 ` Philippe Schenker
2019-08-12 14:21 ` Philippe Schenker [this message]
2019-08-15 11:04 ` [PATCH v4 12/21] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Oleksandr Suvorov
2019-08-19 11:30 ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 13/21] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board Philippe Schenker
2019-08-15 11:00 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 14/21] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
2019-08-16 7:09 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 15/21] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
2019-08-15 7:55 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 16/21] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 17/21] ARM: dts: imx6ull: improve can templates Philippe Schenker
2019-08-15 7:42 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 18/21] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
2019-08-15 13:44 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 19/21] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board Philippe Schenker
2019-08-15 11:02 ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 20/21] ARM: dts: imx7-colibri: Add UHS support to eval board Philippe Schenker
2019-08-16 6:44 ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 21/21] ARM: dts: imx6qdl-colibri.dtsi: UHS-I support for v1.1a hw Philippe Schenker
2019-08-16 6:44 ` Philippe Schenker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190812142105.1995-13-philippe.schenker@toradex.com \
--to=philippe.schenker@toradex.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=max.krummenacher@toradex.com \
--cc=michal.vokac@ysoft.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stefan@agner.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).