From patchwork Tue Jul 5 08:58:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12906130 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 9DCB2C433EF for ; Tue, 5 Jul 2022 09:09:45 +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: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:In-Reply-To:References: List-Owner; bh=NNMeLygvKbtGrqNEMJ2zF1MX1cDLmE3SwwVqaPOr8Pw=; b=XfAPRSiWI93dVg wG3o3ygrP7eyR6s9s5XABBH1/X+qA+IKeISpaeVD/VTwcIyOi/izbVGzYJy8mjd5g3dBhcSYyZS6p wt1RiGSZVoc4YWURber4SFBLp5qCVH7j8/PlaUPMQQpRXua1L+KnLJdMwADJHurZyjIfsXpswteNx pp2FulaUM9RwvoLFoUBfL8b8gXWydMzONSUZDkRxl2At6rWszBvkmbBRqxZ7zVJyUvmWolQurcmwa CfV4J7zcMIOL12LgxjJcbbLwqMXs3SikqzH9Bmd1hPpA4QYFzMb5MKZEIVhLVCPWDSKh8Zdh5RtqM F1RTBy+ZxdyTbRBdVGHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8eXV-00GVoH-Ue; Tue, 05 Jul 2022 09:08:14 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8eON-00GQHO-Tx for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2022 08:58:53 +0000 Received: by mail-wr1-x42d.google.com with SMTP id s1so16529898wra.9 for ; Tue, 05 Jul 2022 01:58:41 -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:mime-version :content-transfer-encoding; bh=vk3XdzmxOZuQX0X0Z6lMmqAn6GT0lpJyIL575BVtaGI=; b=VJvXZ3rpFPUdQyfNiF+cSDsuTwRaAPFg6qME/h+d2kQWm9kQVVolCtWpzxbLaHzPrX SidADnmqdwAYM6NlDYHb3DAgG2NveV8a2uMnO716wlBymk+LUkzXts/6/13OPuknpXCa acsDveGGuEevSLsJGA+x3ft0HcIx9W5akWGkWVsfrCRWZ3YQXc80W8YKjVRzJ6Cv0ITQ 55zu7IwjZMp2+AeBTTbPITXRBhfQDkf7W7WK7CtJM9RTRrU2T9oXiMj74bWWp/Q/sGZd UpcmmQCvJ4XKlj+mBTTdHtnsyUMr+DE1IfXcrer3qbJwiPvoxsHvX8BKteCAqwh8Nnxu /1/w== 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:mime-version :content-transfer-encoding; bh=vk3XdzmxOZuQX0X0Z6lMmqAn6GT0lpJyIL575BVtaGI=; b=Bl67SwEqTq16ubMcL34rxYGKBxjzaNoVWKkfBjMypTaN432LVOINBdP//ussMm2Ulp Ie1bMMxGR5/cKrw9alONzCM2UaTp+aU4etftlN9lfBVysBwyNB/NVYr8D+i4+5aaTct3 TislDaEghNV97G2E4UAI+3ZtKaCLd9MCFjgHtb7nFKcjLv3nVVaRXiRAur8mOyvKhhuC +67HCajytM9RbTvsmdMWh6sam/XftReR9YOgL/4W4Uydls7GhsfyOQiVloqkLUYLLWp+ bCOg2YtmsIa/bJVPeMzfk6L4mpbfM6v8XPL9SPDNMy0Lpqca+iRjbSOP+9z0hErwzqKT D7YQ== X-Gm-Message-State: AJIora8ZpJN0nGNqh2Sc3FrHrJ7sNK2UhD+x/NxiWpr/06gRC1eR1tH/ 4gkexHxwp/qcmUromcd2ZHE= X-Google-Smtp-Source: AGRyM1uFtZJgxb7pIDxo5NVWNteuQ5ccm6KEylFZ2mugvloXx5fSiP0U7ovYfO99/NaN3pBx6LmwTA== X-Received: by 2002:adf:d1c2:0:b0:21b:e465:1e36 with SMTP id b2-20020adfd1c2000000b0021be4651e36mr32397699wrd.271.1657011520750; Tue, 05 Jul 2022 01:58:40 -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 x11-20020adff0cb000000b0021b92171d28sm39924763wro.54.2022.07.05.01.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 01:58:40 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Denys Drozdov , Fabio Estevam , Krzysztof Kozlowski , Marcel Ziswiler , 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] ARM: dts: colibri-imx6ull: fix snvs pinmux group Date: Tue, 5 Jul 2022 10:58:24 +0200 Message-Id: <20220705085825.21255-1-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220705_015848_035129_832F0DD3 X-CRM114-Status: GOOD ( 12.17 ) 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 A pin controlled by the iomuxc-snvs pin controller must be specified under the dtb's iomuxc-snvs node. Move the one and only pin of that category from the iomuxc node and set the pinctrl-0 using it accordingly. Fixes: 2aa9d6201949 ("ARM: dts: imx6ull-colibri: add touchscreen device nodes") Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6ull-colibri.dtsi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 623bb7585ad1..577a424b0e1d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -165,7 +165,7 @@ atmel_mxt_ts: touchscreen@4a { compatible = "atmel,maxtouch"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_atmel_conn>; + pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>; reg = <0x4a>; interrupt-parent = <&gpio5>; interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 / INT */ @@ -330,7 +330,6 @@ pinctrl_atmel_conn: atmelconngrp { fsl,pins = < MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0xb0a0 /* SODIMM 106 */ - MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ >; }; @@ -683,6 +682,12 @@ }; &iomuxc_snvs { + pinctrl_atmel_snvs_conn: atmelsnvsconngrp { + fsl,pins = < + MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04 0xb0a0 /* SODIMM 107 */ + >; + }; + pinctrl_snvs_gpio1: snvsgpio1grp { fsl,pins = < MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */