From patchwork Mon May 16 11:58:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12850675 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 BA871C433EF for ; Mon, 16 May 2022 12:01:38 +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=JivbDZOvnxQal1sZziK39ZJWeX3XCy8YHdRrPZoY0R4=; b=ut7SKGfFbXsXVS yJRP3Q32AFZzw5vBVfockT99QF3f9XV6Gt9qpRl63g6ot3Mo4kD+ehcsCugX9g0uh13lP7x+RvPTm 4P6N9hfxJqWOhov+QG1mo3/S4QiPkIZUCk9HCpI4vmC29NBv5FVxgO4wAMuJI4Ns4eECyyHCEHBd2 KzinYMbhi9T9ais+4+CAKRdZWTqS4xLph8QQjf9u7K0z0YvpQg+eaM6AGMLK8ADt1N9yXbz6SihzK G9y6jhMlUvtHyZQVmEdHnP8yz3XgYC4me64kash1g7yk8YSpllXPpcjnaAcQ01SYGi/531fYff+99 +3c2on5kCUapleD576pQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqZOg-007Q0R-SC; Mon, 16 May 2022 12:00:24 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nqZNo-007PaK-76 for linux-arm-kernel@lists.infradead.org; Mon, 16 May 2022 11:59:29 +0000 Received: by mail-ed1-x531.google.com with SMTP id p26so1751719eds.5 for ; Mon, 16 May 2022 04:59:28 -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=mmdHqA0oaYOkSe9dGsepZveX0B9uSDC/sB1WxfLB/rc=; b=nWOMwweBoLWmosmAjjSCbL4rr16qLV3iGprVRhu3Q5guf2p2PcT+XZzH1uyNjzEX9F whwFjVnBWCmVDjJm6MJT5TLtcpYhrxaG4sT3PDZZhJp3/r9PbsP4znIoFzWelUbrWetc Bp9Ki/Ch0Hj2LGYZJHDu+c0YpTHDO9kcE1Jq0VbCwzezfsOxoxmrcClE2SQzBCHs+Gur 8wiuoJ5XqvH32J1SdyBIdM2MaP5MJ+Cu9meSUjRUetNXHt9ISn9t9dF8weDkc+YWrmyP aG2uPWCgVe1pJKuwMK0ZURSwRV9pa6qMa6ExYCa5V9f8Y+QBBP76DmLmhOnZ7NyXNXk5 fIug== 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=mmdHqA0oaYOkSe9dGsepZveX0B9uSDC/sB1WxfLB/rc=; b=CeTb9Jwp4mSqPCuDk/HjIBF0n5vrwTlUQqY/jACW0dU8D/4W18gVZ1bYcDih9OGvy4 GziA/35I+JxloKyQMHDgACi98rtPkx4aN8ADjPRFl9OJcqZ4uTe2yIgpsZXtBTufJRpU sTf1gtAFSB4t+OQuw5/el8s/bl+lqaSoI0RvolC8Vhn7N0xh9vhdGmQ4DTdPTUv6IoPr Y7Nc76vPG3LSZ3bAGoum4vDpAmShoybXkf6fM7hFQEiQZUDqBSQCLF0oeDe/Fw/dRKuL R9jnJiQHj9JR+JbAaipHyrGWq3blD/wo8IfAY1Yd116RH6QVwmrI/RtHPx/e7PT68ig+ eCUQ== X-Gm-Message-State: AOAM5327+y4/BzUAhhaT7jCsz7LOgyN0pEucHohneS4wg8fm4Emd7hoP 98EA3C0t66oxLDjhtrPLG50= X-Google-Smtp-Source: ABdhPJw60VJVPlZ1+ug5yXxRRBD2eI28gxK/k1AZCRb2cueQONF2HtDPxz4ZNaaRz4uXP6VgxncvTg== X-Received: by 2002:a05:6402:d0e:b0:413:3d99:f2d6 with SMTP id eb14-20020a0564020d0e00b004133d99f2d6mr12990573edb.189.1652702367114; Mon, 16 May 2022 04:59:27 -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 s18-20020a170906779200b006f3ef214dacsm3711008ejm.18.2022.05.16.04.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 04:59:26 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Oleksandr Suvorov , 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 v1 06/17] ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi Date: Mon, 16 May 2022 13:58:34 +0200 Message-Id: <20220516115846.58328-7-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220516115846.58328-1-max.oss.09@gmail.com> References: <20220516115846.58328-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-20220516_045928_318819_90B44E3B X-CRM114-Status: GOOD ( 14.60 ) 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: Oleksandr Suvorov GPIO pinmux groups are declared on the module level. Move muxing them to the same level. It also reduces code duplication. Signed-off-by: Oleksandr Suvorov Signed-off-by: Max Krummenacher --- arch/arm/boot/dts/imx6q-apalis-eval.dts | 12 ------------ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 10 ---------- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 8 -------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 8 ++++++++ 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 1e6b5482a777..fe5d491e1399 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -206,15 +206,3 @@ cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; status = "okay"; }; - -&iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; -}; 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 527585d26e51..8febfc0aea93 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -202,16 +202,6 @@ }; &iomuxc { - /* - * Mux the Apalis GPIOs - */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; - pinctrl_leds_ixora: ledsixoragrp { fsl,pins = < MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 9900ab04fb28..78cf1d9583c1 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -205,14 +205,6 @@ }; &iomuxc { - /* Mux the Apalis GPIOs */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 - &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 - &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 - &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 - >; - pinctrl_leds_ixora: ledsixoragrp { fsl,pins = < MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index c0ae08780d86..9413c14ce5f6 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -709,6 +709,14 @@ }; &iomuxc { + /* Mux the Apalis GPIOs */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6 + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8 + >; + pinctrl_apalis_gpio1: gpio2io04grp { fsl,pins = < MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0