From patchwork Wed Jun 15 11:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882232 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48002C43334 for ; Wed, 15 Jun 2022 11:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jNDcc2zHKMq6ngjKH5DBSE1k18/bEAYqiZAJgc+ptBU=; b=FmeyEu/d3pm+BF Ib3a7T5cr1JcvliV0uiSbSS8ZtmgGPgp11Eop9iMWClJulXeiuQxRBNLY+ug3cyf6JvQ8Ug8c1lP3 tSPnSwPtSPaASYs9Cb8ibabPaDqFAz0oBkVQ51Ma5Yady5GWh6Rqmj3gpmsMdF+LH8k3g3Xl6UK8U QdeKNT5eGL+McuwOIyiL/tmc9GEcLtvvTX1MiRov+Fc0yEgzAJlKd6qe5onkL0LxYUsohC9QcteFT WBZUN5ZLAzjcf+oedgLDopTksQ4CCKr3Ixun+htiHIWaxV2scoiJ4gHbez8zzEP0AtFagVGUgIrV5 BCHek7z3/2ntRnYRx0jw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RZo-00EHss-D1; Wed, 15 Jun 2022 11:52:48 +0000 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RXy-00EGkI-NC for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:50:56 +0000 Received: by mail-ej1-x634.google.com with SMTP id s12so22725614ejx.3 for ; Wed, 15 Jun 2022 04:50:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pMf+gn9LvzLdD1VC7pS9QUk31VCqeS4SgKv1PVXD/FU=; b=G+pqPrhvrERMKQE8/kFpbxSRzKOfTs8FDlgIjxKoXAwZVy/cnapLbut34HEdCWYCC0 RwbN/VCBZyxwb5p846sSBjBoR7oXijGTDrlUMhXLusrnEHQzg0lITt3hhj3C82OWBwsA Bfl8n2rH6ULh52Ya+XJCyGtPMch5fUUT/HbjVxk9riiODq6vkd3I/n9N1BTDXFo6qC/g FQsMq8B5fs2rywQeYYhvgPOCn/8LC//Osbq6W18D0sJnePOL5y100sMkIbqlUnhOHY7f K9i9ZpUCjuVpyF/3bRh3Lz56gpEIpefgNrnQWQDvlaQzEpxXIhUwF8fpL42nvnAEKmLh 82ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pMf+gn9LvzLdD1VC7pS9QUk31VCqeS4SgKv1PVXD/FU=; b=at5Vdi2arwGf7ivRvq1n1gKPOcIKvJqSK+QzmivcLBj4HOEZVUyJkWQQ+AN1qWqyqU 1dLSHBbJ2SdMaAnHZA5cuYOTfDq8tTDhd7/f2WwIXgoyz6otx2lwnWrBKe5X38mFTqvO OnnoxDgKzF1d9j0a7G4kumeWsmt9gBjLdy3WAtFC14NT+9YmoDfbPLOZZpaZFcxpZ5wK Vl+X77REM9CXGe0gIRYV+L1CA/c9IQfvjfTqESlFQt75Tjv/8anLnuQLTulMNSCYmz94 Hy4G4UflnLPwNdFa5j/T/6Z9pdkQXk3hax/Mq4iIQehRm7/jOrjO2wJH7Djb0eIQo5G6 2jNQ== X-Gm-Message-State: AOAM532xRhVwsIYv7kvYDmbw4K4ehqTIc7Dnl6CV27SMXOsUABqzYo4g uT4n5xWgnHaOw8MC4HAPRSs= X-Google-Smtp-Source: ABdhPJypLpKRmt5Y2u7ALtLUPy499ZLRSRRhuvfvQgi/AGDpkxf3KPYyIFatSUAGGptgohT1QAKVsQ== X-Received: by 2002:a17:906:1084:b0:712:2989:b630 with SMTP id u4-20020a170906108400b007122989b630mr8468195eju.344.1655293852417; Wed, 15 Jun 2022 04:50:52 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:50:51 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 07/18] ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi Date: Wed, 15 Jun 2022 13:49:55 +0200 Message-Id: <20220615115006.45672-8-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045054_790978_72DFE9E5 X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Max Krummenacher Reduces code duplication. While at it drop the comments which do not apply on Apalis iMX6 but add the correct SoM pin names. Signed-off-by: Max Krummenacher --- (no changes since v1) 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 ------------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 11 +++++++++++ 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index fe5d491e1399..5985d1169be1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -82,19 +82,6 @@ &i2c1 { status = "okay"; - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * 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_LOW>; /* 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 8febfc0aea93..21f88e19e87d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -89,19 +89,6 @@ &i2c1 { status = "okay"; - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * 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_LOW>; /* 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 78cf1d9583c1..6743617ad1c1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -88,19 +88,6 @@ &i2c1 { status = "okay"; - /* - * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, - * 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_LOW>; /* SODIMM 13 */ - status = "disabled"; - }; - eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 9413c14ce5f6..3aa66b6d0c88 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -416,6 +416,17 @@ scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "disabled"; + + atmel_mxt_ts: touchscreen@4a { + compatible = "atmel,maxtouch"; + /* These GPIOs are muxed with the iomuxc node */ + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; /* MXM3_11 */ + reg = <0x4a>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* MXM3_13 */ + status = "disabled"; + }; + }; /*