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 5.12 024/102] ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]
Date: Wed, 14 Jul 2021 15:39:17 -0400	[thread overview]
Message-ID: <20210714194036.53141-24-sashal@kernel.org> (raw)
In-Reply-To: <20210714194036.53141-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


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

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 19:38 [PATCH AUTOSEL 5.12 001/102] ARM: dts: gemini: rename mdio to the right name Sasha Levin
2021-07-14 19:38 ` [PATCH AUTOSEL 5.12 002/102] ARM: dts: gemini: add device_type on pci Sasha Levin
2021-07-14 19:38 ` [PATCH AUTOSEL 5.12 003/102] ARM: dts: rockchip: Fix thermal sensor cells o rk322x Sasha Levin
2021-07-14 19:38 ` [PATCH AUTOSEL 5.12 004/102] ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 Sasha Levin
2021-07-14 19:38 ` [PATCH AUTOSEL 5.12 005/102] arm64: dts: rockchip: Use only supported PCIe link speed on rk3399 Sasha Levin
2021-07-14 19:38 ` [PATCH AUTOSEL 5.12 006/102] arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 007/102] ARM: dts: rockchip: Fix the timer clocks order Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 008/102] ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 009/102] ARM: dts: rockchip: Fix power-controller node names for rk3066a Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 010/102] ARM: dts: rockchip: Fix power-controller node names for rk3188 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 011/102] ARM: dts: rockchip: Fix power-controller node names for rk3288 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 012/102] arm64: dts: rockchip: Fix power-controller node names for px30 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 013/102] arm64: dts: rockchip: Fix power-controller node names for rk3328 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 014/102] arm64: dts: rockchip: Fix power-controller node names for rk3399 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 015/102] reset: ti-syscon: fix to_ti_syscon_reset_data macro Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 016/102] ARM: dts: BCM5301X: Fix NAND nodes names Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 017/102] ARM: brcmstb: dts: fix " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 018/102] ARM: Cygnus: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 019/102] ARM: NSP: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 020/102] ARM: dts: BCM63xx: Fix " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 021/102] ARM: dts: Hurricane 2: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 022/102] ARM: dts: BCM5301X: Fix pinmux subnodes names Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 023/102] soc: bcm: brcmstb: remove unused variable 'brcmstb_machine_match' Sasha Levin
2021-07-14 19:39 ` Sasha Levin [this message]
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 025/102] ARM: dts: exynos: align Broadcom WiFi with dtschema Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 026/102] soc: mediatek: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 027/102] ARM: dts: imx6: phyFLEX: Fix UART hardware flow control Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 028/102] ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 029/102] arm64: dts: rockchip: fix regulator-gpio states array Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 030/102] ARM: dts: ux500: Fix interrupt cells Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 031/102] ARM: dts: ux500: Rename gpio-controller node Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 032/102] ARM: dts: ux500: Fix orientation of accelerometer Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 033/102] ARM: dts: ux500: Fix some compatible strings Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 034/102] ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 035/102] ARM: dts: ux500: Fix orientation of Janice accelerometer Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 036/102] rtc: mxc_v2: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 037/102] arm64: dts: renesas: beacon: Fix USB extal reference Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 038/102] arm64: dts: renesas: beacon: Fix USB ref clock references Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 039/102] kbuild: sink stdout from cmd for silent build Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 040/102] ARM: dts: am335x: align GPIO hog names with dt-schema Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 041/102] ARM: dts: am437x: align gpio " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 042/102] ARM: dts: omap3: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 043/102] ARM: dts: omap5-board-common: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 044/102] ARM: dts: dra7x-evm: Align GPIO " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 045/102] ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 046/102] ARM: dts: am437x-gp-evm: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 047/102] ARM: dts: am335x: " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 048/102] ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 049/102] arm64: tegra: Add PMU node for Tegra194 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 050/102] arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 051/102] ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 052/102] ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 053/102] arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work) Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 054/102] arm64: dts: qcom: sc7180: Move rmtfs memory region Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 055/102] ARM: dts: stm32: Remove extra size-cells on dhcom-pdk2 Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 056/102] ARM: dts: stm32: Fix touchscreen node " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 057/102] ARM: dts: stm32: fix stm32mp157c-odyssey card detect pin Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 058/102] ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 059/102] ARM: dts: stm32: fix RCC node name on stm32f429 MCU Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 060/102] ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 061/102] memory: tegra: Fix compilation warnings on 64bit platforms Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 062/102] firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 063/102] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 064/102] ARM: dts: bcm283x: Fix up MMC node names Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 065/102] ARM: dts: bcm283x: Fix up GPIO LED " Sasha Levin
2021-07-14 19:39 ` [PATCH AUTOSEL 5.12 066/102] i3c: master: svc: drop free_irq of devm_request_irq allocated irq Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 067/102] arm64: dts: juno: Update SCPI nodes as per the YAML schema Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 068/102] ARM: dts: rockchip: fix supply properties in io-domains nodes Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 069/102] ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 070/102] ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 071/102] ARM: dts: stm32: fix the Odyssey SoM eMMC VQMMC supply Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 072/102] ARM: dts: stm32: Drop unused linux,wakeup from touchscreen node on DHCOM SoM Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 073/102] ARM: dts: stm32: Rename eth@N to ethernet@N " Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 074/102] ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N " Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 075/102] ARM: dts: stm32: fix stpmic node for stm32mp1 boards Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 076/102] ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 077/102] soc/tegra: fuse: Fix Tegra234-only builds Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 078/102] firmware: tegra: bpmp: " Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 079/102] arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 080/102] arm64: dts: ls208xa: remove bus-num from dspi node Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 081/102] arm64: dts: imx8mn-beacon-som: Assign PMIC clock Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 082/102] arm64: dts: imx8mq: assign PCIe clocks Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 083/102] thermal/core: Correct function name thermal_zone_device_unregister() Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 084/102] thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1 Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 085/102] thermal/drivers/imx_sc: Add missing of_node_put for loop iteration Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 086/102] thermal/drivers/sprd: " Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 087/102] arm64: dts: qcom: sm8250: Fix pcie2_lane unit address Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 088/102] arm64: dts: qcom: sm8150: Disable Adreno and modem by default Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 089/102] kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 090/102] arch/arm64/boot/dts/marvell: fix NAND partitioning scheme Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 091/102] rtc: max77686: Do not enforce (incorrect) interrupt trigger type Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 092/102] scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 093/102] scsi: libsas: Add LUN number check in .slave_alloc callback Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 094/102] scsi: be2iscsi: Fix some missing space in some messages Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 095/102] scsi: libfc: Fix array index out of bound exception Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 096/102] scsi: qedf: Add check to synchronize abort and flush Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 097/102] sched/fair: Fix CFS bandwidth hrtimer expiry type Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 098/102] perf/x86/intel/uncore: Clean up error handling path of iio mapping Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 099/102] thermal/core/thermal_of: Stop zone device before unregistering it Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 100/102] s390/traps: do not test MONITOR CALL without CONFIG_BUG Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 101/102] s390: introduce proper type handling call_on_stack() macro Sasha Levin
2021-07-14 19:40 ` [PATCH AUTOSEL 5.12 102/102] cifs: prevent NULL deref in cifs_compose_mount_options() 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=20210714194036.53141-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).