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 5.13 024/108] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]
Date: Wed, 14 Jul 2021 15:36:36 -0400 [thread overview]
Message-ID: <20210714193800.52097-24-sashal@kernel.org> (raw)
In-Reply-To: <20210714193800.52097-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 f984b702efc5..908caf810351 100644
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -563,15 +563,15 @@
#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
@@ -580,18 +580,18 @@
#define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000
#define MX25_PAD_GPIO_C__CSPI2_SS2 0x1fc 0x3f8 0x000 0x07 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_D__CSPI3_SS2 0x200 0x3fc 0x4c4 0x07 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
next prev parent reply other threads:[~2021-07-14 19:38 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 19:36 [PATCH AUTOSEL 5.13 001/108] ARM: dts: gemini: rename mdio to the right name Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 002/108] ARM: dts: gemini: add device_type on pci Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 003/108] ARM: dts: rockchip: Fix thermal sensor cells o rk322x Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 004/108] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 005/108] arm64: dts: rockchip: Use only supported PCIe link speed on rk3399 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 006/108] arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 007/108] ARM: dts: rockchip: Fix the timer clocks order Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 008/108] ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 009/108] ARM: dts: rockchip: Fix power-controller node names for rk3066a Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 010/108] ARM: dts: rockchip: Fix power-controller node names for rk3188 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 011/108] ARM: dts: rockchip: Fix power-controller node names for rk3288 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 012/108] arm64: dts: rockchip: Fix power-controller node names for px30 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 013/108] arm64: dts: rockchip: Fix power-controller node names for rk3328 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 014/108] arm64: dts: rockchip: Fix power-controller node names for rk3399 Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 016/108] ARM: dts: BCM5301X: Fix NAND nodes names Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 017/108] ARM: brcmstb: dts: fix " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 018/108] ARM: Cygnus: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 019/108] ARM: NSP: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 020/108] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 021/108] ARM: dts: Hurricane 2: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 022/108] ARM: dts: BCM5301X: Fix pinmux subnodes names Sasha Levin
2021-07-14 19:36 ` Sasha Levin [this message]
2021-07-14 20:35 ` [PATCH AUTOSEL 5.13 024/108] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F] Uwe Kleine-König
2021-07-14 20:59 ` Sasha Levin
2021-07-15 7:16 ` Uwe Kleine-König
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 025/108] ARM: dts: exynos: align Broadcom WiFi with dtschema Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 027/108] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 029/108] arm64: dts: rockchip: fix regulator-gpio states array Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 030/108] ARM: dts: ux500: Fix interrupt cells Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 031/108] ARM: dts: ux500: Rename gpio-controller node Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 032/108] ARM: dts: ux500: Fix orientation of accelerometer Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 033/108] ARM: dts: ux500: Fix some compatible strings Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 034/108] ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 035/108] ARM: dts: ux500: Fix orientation of Janice accelerometer Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 037/108] arm64: dts: renesas: beacon: Fix USB extal reference Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 038/108] arm64: dts: renesas: beacon: Fix USB ref clock references Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 040/108] ARM: dts: am335x: align GPIO hog names with dt-schema Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 041/108] ARM: dts: am437x: align gpio " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 042/108] ARM: dts: omap3: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 043/108] ARM: dts: omap5-board-common: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 044/108] ARM: dts: dra7x-evm: Align GPIO " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 045/108] ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 046/108] ARM: dts: am437x-gp-evm: " Sasha Levin
2021-07-14 19:36 ` [PATCH AUTOSEL 5.13 047/108] ARM: dts: am335x: " Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 048/108] ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 049/108] arm64: tegra: Add PMU node for Tegra194 Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 050/108] arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 051/108] ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 052/108] ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 053/108] arm64: dts: qcom: sm8350: fix the node unit addresses Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 054/108] arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work) Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 055/108] arm64: dts: qcom: sm8250: fix display nodes Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 056/108] arm64: dts: qcom: sc7180: Move rmtfs memory region Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 057/108] ARM: dts: stm32: Remove extra size-cells on dhcom-pdk2 Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 058/108] ARM: dts: stm32: Fix touchscreen node " Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 059/108] ARM: dts: stm32: fix stm32mp157c-odyssey card detect pin Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 060/108] ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 061/108] ARM: dts: stm32: fix RCC node name on stm32f429 MCU Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 062/108] ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 066/108] ARM: dts: aspeed: Everest: Fix cable card PCA chips Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 067/108] ARM: dts: bcm283x: Fix up MMC node names Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 068/108] ARM: dts: bcm283x: Fix up GPIO LED " Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 070/108] arm64: dts: juno: Update SCPI nodes as per the YAML schema Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 071/108] ARM: dts: rockchip: fix supply properties in io-domains nodes Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 072/108] ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 073/108] ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 074/108] ARM: dts: stm32: fix ltdc pinctrl on microdev2.0-of7 Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 075/108] ARM: dts: stm32: fix the Odyssey SoM eMMC VQMMC supply Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 076/108] ARM: dts: stm32: Drop unused linux,wakeup from touchscreen node on DHCOM SoM Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 077/108] ARM: dts: stm32: Rename eth@N to ethernet@N " Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 078/108] ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N " Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 079/108] ARM: dts: stm32: fix stpmic node for stm32mp1 boards Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 080/108] arm64: dts: qcom: sc7180: Add wakeup delay for adau codec Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 084/108] arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 085/108] arm64: dts: ls208xa: remove bus-num from dspi node Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 086/108] arm64: dts: imx8mn-beacon-som: Assign PMIC clock Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 087/108] arm64: dts: imx8mq: assign PCIe clocks Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 088/108] arm64: dts: imx8: conn: fix enet clock setting Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 093/108] arm64: dts: qcom: sm8250: Fix pcie2_lane unit address Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 094/108] arm64: dts: qcom: sm8150: Disable Adreno and modem by default Sasha Levin
2021-07-14 19:37 ` [PATCH AUTOSEL 5.13 096/108] arch/arm64/boot/dts/marvell: fix NAND partitioning scheme 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=20210714193800.52097-24-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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).