From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 245EEC47E4B for ; Wed, 14 Jul 2021 19:59:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1243660240 for ; Wed, 14 Jul 2021 19:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237905AbhGNUCF (ORCPT ); Wed, 14 Jul 2021 16:02:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:48288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241395AbhGNTue (ORCPT ); Wed, 14 Jul 2021 15:50:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5A5A5613B5; Wed, 14 Jul 2021 19:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292062; bh=J3E8diip/2yZPULB10uWieiD+RKjCRK4kIqczZDQBwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qh9VwrPhntbp5/16qxQZxn41EHuMOForYrNLP7vgSTnMUyIvRMe0VAEpr/ZHwOdDn fe3XQx4DXR27l9GlOL0songh3k4+W8So4aDG3V97DcVLoiJtBTH3ftUVMl2jtqQKFX aC8U3hLSHzaNy0z1FAu+5lE2iPRqUnpxCZlCLeuVyu57ZcojcT3+lmHiSl+rZ2puNS frkuyu+A1QK1ByRcp+kevhVA2m5gxEEVXqYxWXEfkqa5Izzha9XlYa+WUGhqHQzjHb UJCuldWC5Ra7gnghm57B5niexFIlvIXo/LGLk8GBrnk3M/dZwJdBn3/DTS8oBSqV+3 1F5XKXzrd8JMg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Shawn Guo , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 12/28] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Date: Wed, 14 Jul 2021 15:47:07 -0400 Message-Id: <20210714194723.55677-12-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194723.55677-1-sashal@kernel.org> References: <20210714194723.55677-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Uwe Kleine-König [ Upstream commit e0cdd26af8eb9001689a4cde4f72c61c1c4b06be ] The pinfunc definitions used GPIO_A as function instead of GPIO_1_0 as done for all the other pins with GPIO functionality. Fix for consistency. There are no mainline users that needs adaption. Signed-off-by: Uwe Kleine-König Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx25-pinfunc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h index 6c63dca1b9b8..0d20d291feb0 100644 --- a/arch/arm/boot/dts/imx25-pinfunc.h +++ b/arch/arm/boot/dts/imx25-pinfunc.h @@ -544,31 +544,31 @@ #define MX25_PAD_DE_B__DE_B 0x1f0 0x3ec 0x000 0x00 0x000 #define MX25_PAD_DE_B__GPIO_2_20 0x1f0 0x3ec 0x000 0x05 0x000 -#define MX25_PAD_GPIO_A__GPIO_A 0x1f4 0x3f0 0x000 0x00 0x000 +#define MX25_PAD_GPIO_A__GPIO_1_0 0x1f4 0x3f0 0x000 0x00 0x000 #define MX25_PAD_GPIO_A__CAN1_TX 0x1f4 0x3f0 0x000 0x06 0x000 #define MX25_PAD_GPIO_A__USBOTG_PWR 0x1f4 0x3f0 0x000 0x02 0x000 -#define MX25_PAD_GPIO_B__GPIO_B 0x1f8 0x3f4 0x000 0x00 0x000 +#define MX25_PAD_GPIO_B__GPIO_1_1 0x1f8 0x3f4 0x000 0x00 0x000 #define MX25_PAD_GPIO_B__USBOTG_OC 0x1f8 0x3f4 0x57c 0x02 0x001 #define MX25_PAD_GPIO_B__CAN1_RX 0x1f8 0x3f4 0x480 0x06 0x001 -#define MX25_PAD_GPIO_C__GPIO_C 0x1fc 0x3f8 0x000 0x00 0x000 +#define MX25_PAD_GPIO_C__GPIO_1_2 0x1fc 0x3f8 0x000 0x00 0x000 #define MX25_PAD_GPIO_C__PWM4_PWMO 0x1fc 0x3f8 0x000 0x01 0x000 #define MX25_PAD_GPIO_C__I2C2_SCL 0x1fc 0x3f8 0x51c 0x02 0x001 #define MX25_PAD_GPIO_C__KPP_COL4 0x1fc 0x3f8 0x52c 0x03 0x001 #define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000 -#define MX25_PAD_GPIO_D__GPIO_D 0x200 0x3fc 0x000 0x00 0x000 +#define MX25_PAD_GPIO_D__GPIO_1_3 0x200 0x3fc 0x000 0x00 0x000 #define MX25_PAD_GPIO_D__I2C2_SDA 0x200 0x3fc 0x520 0x02 0x001 #define MX25_PAD_GPIO_D__CAN2_RX 0x200 0x3fc 0x484 0x06 0x001 -#define MX25_PAD_GPIO_E__GPIO_E 0x204 0x400 0x000 0x00 0x000 +#define MX25_PAD_GPIO_E__GPIO_1_4 0x204 0x400 0x000 0x00 0x000 #define MX25_PAD_GPIO_E__I2C3_CLK 0x204 0x400 0x524 0x01 0x002 #define MX25_PAD_GPIO_E__LD16 0x204 0x400 0x000 0x02 0x000 #define MX25_PAD_GPIO_E__AUD7_TXD 0x204 0x400 0x000 0x04 0x000 #define MX25_PAD_GPIO_E__UART4_RXD 0x204 0x400 0x570 0x06 0x002 -#define MX25_PAD_GPIO_F__GPIO_F 0x208 0x404 0x000 0x00 0x000 +#define MX25_PAD_GPIO_F__GPIO_1_5 0x208 0x404 0x000 0x00 0x000 #define MX25_PAD_GPIO_F__LD17 0x208 0x404 0x000 0x02 0x000 #define MX25_PAD_GPIO_F__AUD7_TXC 0x208 0x404 0x000 0x04 0x000 #define MX25_PAD_GPIO_F__UART4_TXD 0x208 0x404 0x000 0x06 0x000 -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECD14C12002 for ; Wed, 14 Jul 2021 23:05:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A0D2E61360 for ; Wed, 14 Jul 2021 23:05:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0D2E61360 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=vTlXa9WYfPj1Zvk2xuKiV8o7p9ysgjKbUQB1wrASKe0=; b=Sgxy4QKQ01Cmrq p3PgbvoIfulAsjvBt4H9voIIgA2vfLJ42foX2Xt6velpglOtOxzrigbzDAW5cHZ2Tq1xGnq5ZNe/o fn6l/xBpTmRVs1tfJNAuKSmSaDBAkMtmTkCA7EeF0RFggrJNWynsF3+dmdLLsFU/DIt7HUBlo9ru3 qGYGPl4tUPRIzMqSFynfrpdwN2vaQski8SS4oJt4KIOR8RBiqrK59s2GxFM8QoA/N/8/qOWmcYfCO q71VeF2rtk/pmwGEntbQG+SsWpkk1WZzc56JkwT3aUOH5G+AuELfxKZk0J1bm1kufDRrcJEvCGD06 BjO6WlNeWa6piE5Qam6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3ntl-00G6oA-W7; Wed, 14 Jul 2021 23:02:39 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3kr8-00Egs5-LX for linux-arm-kernel@lists.infradead.org; Wed, 14 Jul 2021 19:47:44 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5A5A5613B5; Wed, 14 Jul 2021 19:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626292062; bh=J3E8diip/2yZPULB10uWieiD+RKjCRK4kIqczZDQBwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qh9VwrPhntbp5/16qxQZxn41EHuMOForYrNLP7vgSTnMUyIvRMe0VAEpr/ZHwOdDn fe3XQx4DXR27l9GlOL0songh3k4+W8So4aDG3V97DcVLoiJtBTH3ftUVMl2jtqQKFX aC8U3hLSHzaNy0z1FAu+5lE2iPRqUnpxCZlCLeuVyu57ZcojcT3+lmHiSl+rZ2puNS frkuyu+A1QK1ByRcp+kevhVA2m5gxEEVXqYxWXEfkqa5Izzha9XlYa+WUGhqHQzjHb UJCuldWC5Ra7gnghm57B5niexFIlvIXo/LGLk8GBrnk3M/dZwJdBn3/DTS8oBSqV+3 1F5XKXzrd8JMg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Shawn Guo , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 12/28] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Date: Wed, 14 Jul 2021 15:47:07 -0400 Message-Id: <20210714194723.55677-12-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194723.55677-1-sashal@kernel.org> References: <20210714194723.55677-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210714_124742_828032_6B231F60 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtvZW5pZ0BwZW5ndXRyb25peC5kZT4K ClsgVXBzdHJlYW0gY29tbWl0IGUwY2RkMjZhZjhlYjkwMDE2ODlhNGNkZTRmNzJjNjFjMWM0YjA2 YmUgXQoKVGhlIHBpbmZ1bmMgZGVmaW5pdGlvbnMgdXNlZCBHUElPX0EgYXMgZnVuY3Rpb24gaW5z dGVhZCBvZiBHUElPXzFfMCBhcwpkb25lIGZvciBhbGwgdGhlIG90aGVyIHBpbnMgd2l0aCBHUElP IGZ1bmN0aW9uYWxpdHkuIEZpeCBmb3IgY29uc2lzdGVuY3kuCgpUaGVyZSBhcmUgbm8gbWFpbmxp bmUgdXNlcnMgdGhhdCBuZWVkcyBhZGFwdGlvbi4KClNpZ25lZC1vZmYtYnk6IFV3ZSBLbGVpbmUt S8O2bmlnIDx1LmtsZWluZS1rb2VuaWdAcGVuZ3V0cm9uaXguZGU+ClNpZ25lZC1vZmYtYnk6IFNo YXduIEd1byA8c2hhd25ndW9Aa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4g PHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGFyY2gvYXJtL2Jvb3QvZHRzL2lteDI1LXBpbmZ1bmMu aCB8IDEyICsrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9pbXgyNS1waW5mdW5j LmggYi9hcmNoL2FybS9ib290L2R0cy9pbXgyNS1waW5mdW5jLmgKaW5kZXggNmM2M2RjYTFiOWI4 Li4wZDIwZDI5MWZlYjAgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL2Jvb3QvZHRzL2lteDI1LXBpbmZ1 bmMuaAorKysgYi9hcmNoL2FybS9ib290L2R0cy9pbXgyNS1waW5mdW5jLmgKQEAgLTU0NCwzMSAr NTQ0LDMxIEBACiAjZGVmaW5lIE1YMjVfUEFEX0RFX0JfX0RFX0IJCQkweDFmMCAweDNlYyAweDAw MCAweDAwIDB4MDAwCiAjZGVmaW5lIE1YMjVfUEFEX0RFX0JfX0dQSU9fMl8yMAkJMHgxZjAgMHgz ZWMgMHgwMDAgMHgwNSAweDAwMAogCi0jZGVmaW5lIE1YMjVfUEFEX0dQSU9fQV9fR1BJT19BCQkJ MHgxZjQgMHgzZjAgMHgwMDAgMHgwMCAweDAwMAorI2RlZmluZSBNWDI1X1BBRF9HUElPX0FfX0dQ SU9fMV8wCQkweDFmNCAweDNmMCAweDAwMCAweDAwIDB4MDAwCiAjZGVmaW5lIE1YMjVfUEFEX0dQ SU9fQV9fQ0FOMV9UWAkJMHgxZjQgMHgzZjAgMHgwMDAgMHgwNiAweDAwMAogI2RlZmluZSBNWDI1 X1BBRF9HUElPX0FfX1VTQk9UR19QV1IJCTB4MWY0IDB4M2YwIDB4MDAwIDB4MDIgMHgwMDAKIAot I2RlZmluZSBNWDI1X1BBRF9HUElPX0JfX0dQSU9fQgkJCTB4MWY4IDB4M2Y0IDB4MDAwIDB4MDAg MHgwMDAKKyNkZWZpbmUgTVgyNV9QQURfR1BJT19CX19HUElPXzFfMQkJMHgxZjggMHgzZjQgMHgw MDAgMHgwMCAweDAwMAogI2RlZmluZSBNWDI1X1BBRF9HUElPX0JfX1VTQk9UR19PQwkJMHgxZjgg MHgzZjQgMHg1N2MgMHgwMiAweDAwMQogI2RlZmluZSBNWDI1X1BBRF9HUElPX0JfX0NBTjFfUlgJ CTB4MWY4IDB4M2Y0IDB4NDgwIDB4MDYgMHgwMDEKIAotI2RlZmluZSBNWDI1X1BBRF9HUElPX0Nf X0dQSU9fQwkJCTB4MWZjIDB4M2Y4IDB4MDAwIDB4MDAgMHgwMDAKKyNkZWZpbmUgTVgyNV9QQURf R1BJT19DX19HUElPXzFfMgkJMHgxZmMgMHgzZjggMHgwMDAgMHgwMCAweDAwMAogI2RlZmluZSBN WDI1X1BBRF9HUElPX0NfX1BXTTRfUFdNTwkJMHgxZmMgMHgzZjggMHgwMDAgMHgwMSAweDAwMAog I2RlZmluZSBNWDI1X1BBRF9HUElPX0NfX0kyQzJfU0NMCQkweDFmYyAweDNmOCAweDUxYyAweDAy IDB4MDAxCiAjZGVmaW5lIE1YMjVfUEFEX0dQSU9fQ19fS1BQX0NPTDQJCTB4MWZjIDB4M2Y4IDB4 NTJjIDB4MDMgMHgwMDEKICNkZWZpbmUgTVgyNV9QQURfR1BJT19DX19DQU4yX1RYCQkweDFmYyAw eDNmOCAweDAwMCAweDA2IDB4MDAwCiAKLSNkZWZpbmUgTVgyNV9QQURfR1BJT19EX19HUElPX0QJ CQkweDIwMCAweDNmYyAweDAwMCAweDAwIDB4MDAwCisjZGVmaW5lIE1YMjVfUEFEX0dQSU9fRF9f R1BJT18xXzMJCTB4MjAwIDB4M2ZjIDB4MDAwIDB4MDAgMHgwMDAKICNkZWZpbmUgTVgyNV9QQURf R1BJT19EX19JMkMyX1NEQQkJMHgyMDAgMHgzZmMgMHg1MjAgMHgwMiAweDAwMQogI2RlZmluZSBN WDI1X1BBRF9HUElPX0RfX0NBTjJfUlgJCTB4MjAwIDB4M2ZjIDB4NDg0IDB4MDYgMHgwMDEKIAot I2RlZmluZSBNWDI1X1BBRF9HUElPX0VfX0dQSU9fRQkJCTB4MjA0IDB4NDAwIDB4MDAwIDB4MDAg MHgwMDAKKyNkZWZpbmUgTVgyNV9QQURfR1BJT19FX19HUElPXzFfNAkJMHgyMDQgMHg0MDAgMHgw MDAgMHgwMCAweDAwMAogI2RlZmluZSBNWDI1X1BBRF9HUElPX0VfX0kyQzNfQ0xLCQkweDIwNCAw eDQwMCAweDUyNCAweDAxIDB4MDAyCiAjZGVmaW5lIE1YMjVfUEFEX0dQSU9fRV9fTEQxNgkJCTB4 MjA0IDB4NDAwIDB4MDAwIDB4MDIgMHgwMDAKICNkZWZpbmUgTVgyNV9QQURfR1BJT19FX19BVUQ3 X1RYRAkJMHgyMDQgMHg0MDAgMHgwMDAgMHgwNCAweDAwMAogI2RlZmluZSBNWDI1X1BBRF9HUElP X0VfX1VBUlQ0X1JYRAkJMHgyMDQgMHg0MDAgMHg1NzAgMHgwNiAweDAwMgogCi0jZGVmaW5lIE1Y MjVfUEFEX0dQSU9fRl9fR1BJT19GCQkJMHgyMDggMHg0MDQgMHgwMDAgMHgwMCAweDAwMAorI2Rl ZmluZSBNWDI1X1BBRF9HUElPX0ZfX0dQSU9fMV81CQkweDIwOCAweDQwNCAweDAwMCAweDAwIDB4 MDAwCiAjZGVmaW5lIE1YMjVfUEFEX0dQSU9fRl9fTEQxNwkJCTB4MjA4IDB4NDA0IDB4MDAwIDB4 MDIgMHgwMDAKICNkZWZpbmUgTVgyNV9QQURfR1BJT19GX19BVUQ3X1RYQwkJMHgyMDggMHg0MDQg MHgwMDAgMHgwNCAweDAwMAogI2RlZmluZSBNWDI1X1BBRF9HUElPX0ZfX1VBUlQ0X1RYRAkJMHgy MDggMHg0MDQgMHgwMDAgMHgwNiAweDAwMAotLSAKMi4zMC4yCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxp c3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=