linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Shawn Guo" <shawnguo@kernel.org>,
	"Sasha Levin" <sashal@kernel.org>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 4.19 15/39] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]
Date: Wed, 14 Jul 2021 15:46:00 -0400	[thread overview]
Message-ID: <20210714194625.55303-15-sashal@kernel.org> (raw)
In-Reply-To: <20210714194625.55303-1-sashal@kernel.org>

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

[ 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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 a4807062a90f..7475390370cf 100644
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -548,31 +548,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


  parent reply	other threads:[~2021-07-14 19:58 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 19:45 [PATCH AUTOSEL 4.19 01/39] ARM: dts: gemini: rename mdio to the right name Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 02/39] ARM: dts: gemini: add device_type on pci Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 03/39] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 04/39] arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 05/39] ARM: dts: rockchip: Fix the timer clocks order Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 06/39] ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 07/39] ARM: dts: rockchip: Fix power-controller node names for rk3288 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 08/39] arm64: dts: rockchip: Fix power-controller node names for rk3328 Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 09/39] reset: ti-syscon: fix to_ti_syscon_reset_data macro Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 10/39] ARM: brcmstb: dts: fix NAND nodes names Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 11/39] ARM: Cygnus: " Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 12/39] ARM: NSP: " Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 13/39] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:45 ` [PATCH AUTOSEL 4.19 14/39] ARM: dts: Hurricane 2: " Sasha Levin
2021-07-14 19:46 ` Sasha Levin [this message]
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 16/39] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 17/39] ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 18/39] rtc: mxc_v2: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 19/39] ARM: dts: am335x: align GPIO hog names with dt-schema Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 20/39] ARM: dts: am437x: align gpio " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 21/39] ARM: dts: omap5-board-common: " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 22/39] ARM: dts: dra7x-evm: Align GPIO " Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 23/39] ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 24/39] ARM: dts: stm32: fix RCC node name on stm32f429 MCU Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 25/39] ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 26/39] arm64: dts: juno: Update SCPI nodes as per the YAML schema Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 27/39] ARM: dts: rockchip: fix supply properties in io-domains nodes Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 28/39] ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 29/39] ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 30/39] soc/tegra: fuse: Fix Tegra234-only builds Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 31/39] arm64: dts: ls208xa: remove bus-num from dspi node Sasha Levin
2021-07-23 20:11   ` Pavel Machek
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 32/39] thermal/core: Correct function name thermal_zone_device_unregister() Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 33/39] kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 34/39] rtc: max77686: Do not enforce (incorrect) interrupt trigger type Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 35/39] scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 36/39] scsi: libsas: Add LUN number check in .slave_alloc callback Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 37/39] scsi: be2iscsi: Fix some missing space in some messages Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 38/39] scsi: libfc: Fix array index out of bound exception Sasha Levin
2021-07-14 19:46 ` [PATCH AUTOSEL 4.19 39/39] sched/fair: Fix CFS bandwidth hrtimer expiry type Sasha Levin

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=20210714194625.55303-15-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shawnguo@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --subject='Re: [PATCH AUTOSEL 4.19 15/39] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]' \
    /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

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).