devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Schenker <dev@pschenker.ch>
To: devicetree@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>
Cc: NXP Linux Team <linux-imx@nxp.com>,
	Frank Rowand <frowand.list@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Fabio Estevam <festevam@gmail.com>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	linux-arm-kernel@lists.infradead.org,
	Philippe Schenker <philippe.schenker@toradex.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/23] arm64: dts: colibri-imx8x: Add atmel pinctrl groups
Date: Tue, 14 Mar 2023 11:23:50 +0100	[thread overview]
Message-ID: <20230314102410.424773-5-dev@pschenker.ch> (raw)
In-Reply-To: <20230314102410.424773-1-dev@pschenker.ch>

From: Philippe Schenker <philippe.schenker@toradex.com>

Add pinctrl groups for enabling atmel touchscreen support.
Remove the pads out of pinctrl_hog0 as they now can be enabled more
specific using pinctrl_atmel_conn label.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

(no changes since v1)

 .../boot/dts/freescale/imx8x-colibri.dtsi     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
index 4e0d5762b76c..5019439a3a75 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
@@ -134,6 +134,22 @@ pinctrl_adc0: adc0grp {
 			   <IMX8QXP_ADC_IN5_ADMA_ADC_IN5			0x60>;		/* SODIMM   2 */
 	};
 
+	/* Atmel MXT touchsceen + Capacitive Touch Adapter */
+	/* NOTE: This pingroup conflicts with pingroups
+	 * pinctrl_pwm_b/pinctrl_pwm_c. Don't enable them
+	 * simultaneously.
+	 */
+	pinctrl_atmel_adap: atmeladaptergrp {
+		fsl,pins = <IMX8QXP_UART1_RX_LSIO_GPIO0_IO22			0x21>,		/* SODIMM  30 */
+			   <IMX8QXP_UART1_TX_LSIO_GPIO0_IO21			0x4000021>;	/* SODIMM  28 */
+	};
+
+	/* Atmel MXT touchsceen + boards with built-in Capacitive Touch Connector */
+	pinctrl_atmel_conn: atmelconnectorgrp {
+		fsl,pins = <IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20		0x4000021>,	/* SODIMM 107 */
+			   <IMX8QXP_QSPI0B_SS1_B_LSIO_GPIO3_IO24		0x21>;		/* SODIMM 106 */
+	};
+
 	pinctrl_can_int: canintgrp {
 		fsl,pins = <IMX8QXP_QSPI0A_DQS_LSIO_GPIO3_IO13			0x40>;		/* SODIMM  73 */
 	};
@@ -218,7 +234,6 @@ pinctrl_hog0: hog0grp {
 			   <IMX8QXP_SAI0_TXD_LSIO_GPIO0_IO25			0x20>,		/* SODIMM 103 */
 			   <IMX8QXP_CSI_D01_CI_PI_D03				0x61>,		/* SODIMM 103 */
 			   <IMX8QXP_QSPI0B_DATA1_LSIO_GPIO3_IO19		0x20>,		/* SODIMM 105 */
-			   <IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20		0x20>,		/* SODIMM 107 */
 			   <IMX8QXP_USB_SS3_TC2_LSIO_GPIO4_IO05			0x20>,		/* SODIMM 127 */
 			   <IMX8QXP_USB_SS3_TC3_LSIO_GPIO4_IO06			0x20>,		/* SODIMM 131 */
 			   <IMX8QXP_USB_SS3_TC1_LSIO_GPIO4_IO04			0x20>,		/* SODIMM 133 */
@@ -226,8 +241,7 @@ pinctrl_hog0: hog0grp {
 			   <IMX8QXP_QSPI0B_DATA3_LSIO_GPIO3_IO21		0x20>,		/* SODIMM  98 */
 			   <IMX8QXP_SAI1_RXFS_LSIO_GPIO0_IO31			0x20>,		/* SODIMM 100 */
 			   <IMX8QXP_QSPI0B_DQS_LSIO_GPIO3_IO22			0x20>,		/* SODIMM 102 */
-			   <IMX8QXP_QSPI0B_SS0_B_LSIO_GPIO3_IO23		0x20>,		/* SODIMM 104 */
-			   <IMX8QXP_QSPI0B_SS1_B_LSIO_GPIO3_IO24		0x20>;		/* SODIMM 106 */
+			   <IMX8QXP_QSPI0B_SS0_B_LSIO_GPIO3_IO23		0x20>;		/* SODIMM 104 */
 	};
 
 	pinctrl_hog1: hog1grp {
-- 
2.39.2


  parent reply	other threads:[~2023-03-14 10:25 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-14 10:23 [PATCH v2 00/23] Update Colibri iMX8X Devicetrees Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 01/23] arm64: dts: colibri-imx8x: Prepare for qxp and dx variants Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 02/23] arm64: dts: colibri-imx8x: Update spdx license Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 03/23] arm64: dts: colibri-imx8x: Use new bracket format Philippe Schenker
2023-03-14 10:23 ` Philippe Schenker [this message]
2023-03-14 10:23 ` [PATCH v2 05/23] arm64: dts: colibri-imx8x: Add pinctrl group for csi_mclk Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 06/23] arm64: dts: colibri-imx8x: Split pinctrl_hog1 Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 07/23] arm64: dts: colibri-imx8x: Correct pull on lcdif Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 08/23] arm64: dts: colibri-imx8x: Add separate pinctrl group for cs2 Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 09/23] arm64: dts: colibri-imx8x: Add pinctrl group for hdmi hpd Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 10/23] arm64: dts: colibri-imx8x: Add SPI Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 11/23] arm64: dts: colibri-imx8x: Add gpio-line-names Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 12/23] arm64: dts: colibri-imx8x: Disable touchscreen by default Philippe Schenker
2023-03-14 10:23 ` [PATCH v2 13/23] arm64: dts: colibri-imx8x: Add jpegenc/dec Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 14/23] arm64: dts: colibri-imx8x: Add colibri pwm b, c, d Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 15/23] arm64: dts: colibri-imx8x: eval: Add spi-to-can Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 16/23] arm64: dts: colibri-imx8x: Add no-1-8-v to sd-card Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 17/23] arm64: dts: colibri-imx8x: Set thermal thresholds Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 18/23] arm64: dts: colibri-imx8x: Move gpio-keys to som level Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 19/23] arm64: dts: colibri-imx8x: Add todo comments Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 20/23] dt-bindings: arm: fsl: Add colibri-imx8x carrier boards Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 21/23] arm64: dts: colibri-imx8x: Add aster carrier board Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 22/23] arm64: dts: colibri-imx8x: Add iris " Philippe Schenker
2023-03-14 10:24 ` [PATCH v2 23/23] arm64: dts: colibri-imx8x: Add iris v2 " Philippe Schenker
2023-03-27  2:11 ` [PATCH v2 00/23] Update Colibri iMX8X Devicetrees Shawn Guo

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=20230314102410.424773-5-dev@pschenker.ch \
    --to=dev@pschenker.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=frowand.list@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=philippe.schenker@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    /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).