Thread (4 messages) 4 messages, 2 authors, 21d ago

Re: [PATCH] gpio: move ppc4xx gpio driver from arch/powerpc to drivers/gpio

From: "Christophe Leroy (CS GROUP)" <chleroy@kernel.org>
Date: 2026-05-29 06:50:04
Also in: linux-gpio, lkml


Le 28/05/2026 à 04:56, Rosen Penev a écrit :
Move the ppc4xx gpio driver out of arch/powerpc/platforms/44x/ into
drivers/gpio/gpio-ppc4xx.c. The driver has no architecture-specific
dependencies and follows the same pattern as other PowerPC GPIO
drivers already in drivers/gpio/ (e.g. gpio-mpc8xxx, gpio-mpc5200).

- Renamed Kconfig symbol from PPC4xx_GPIO to GPIO_PPC4XX
- Updated ppc44x_defconfig and warp_defconfig to use the new symbol
- Marked the new option as tristate (was bool) since the driver
   supports module build via module_platform_driver()
- Added COMPILE_TEST support. Needs PPC as clrbits32 is in use.
Not only clrbits32() but also setbits32() and in_be32().

On the long run we want to get rid of PPC specific IO helpers, at least 
outside arch/powerpc/ , so don't add new instances.

Remove that dependency by switching to ioread32be() which has been 
equivalent to in_be32() since commit 894fa235eb4c ("powerpc: inline 
iomap accessors"), then implement a local equivalent of 
clrbits32()/setbits32()

See for instance:
- qe_setbits_be32() in include/soc/fsl/qe/qe.h
- tsa_clrbits32() in drivers/soc/fsl/qe/tsa.c
Assisted-by: OpenCode:BigPickle
Signed-off-by: mangix <redacted>
Who is that ?
---
  arch/powerpc/configs/44x/warp_defconfig                    | 2 +-
  arch/powerpc/configs/ppc44x_defconfig                      | 2 +-
  arch/powerpc/platforms/44x/Kconfig                         | 7 -------
  arch/powerpc/platforms/44x/Makefile                        | 1 -
  drivers/gpio/Kconfig                                       | 7 +++++++
  drivers/gpio/Makefile                                      | 1 +
  .../platforms/44x/gpio.c => drivers/gpio/gpio-ppc4xx.c     | 0
Not gpio-ppc4xx.c but gpio-ppc44x.c
quoted hunk ↗ jump to hunk
  7 files changed, 10 insertions(+), 10 deletions(-)
  rename arch/powerpc/platforms/44x/gpio.c => drivers/gpio/gpio-ppc4xx.c (100%)
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 5757625469c4..380fa15af68d 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -12,7 +12,7 @@ CONFIG_MODULE_UNLOAD=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_EBONY is not set
  CONFIG_WARP=y
-CONFIG_PPC4xx_GPIO=y
+CONFIG_GPIO_PPC4XX=y
  CONFIG_HZ_1000=y
  CONFIG_CMDLINE="ip=on"
  # CONFIG_PCI is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 41c930f74ed4..57a7342232d7 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -22,7 +22,7 @@ CONFIG_GLACIER=y
  CONFIG_REDWOOD=y
  CONFIG_EIGER=y
  CONFIG_YOSEMITE=y
-CONFIG_PPC4xx_GPIO=y
+CONFIG_GPIO_PPC4XX=y
  CONFIG_MATH_EMULATION=y
  CONFIG_NET=y
  CONFIG_PACKET=y
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index fc79f8466933..150813cea945 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -227,13 +227,6 @@ config PPC44x_SIMPLE
  	help
  	  This option enables the simple PowerPC 44x platform support.
  
-config PPC4xx_GPIO
-	bool "PPC4xx GPIO support"
-	depends on 44x
-	select GPIOLIB
-	help
-	  Enable gpiolib support for ppc440 based boards
-
  # 44x specific CPU modules, selected based on the board above.
  config 440EP
  	bool
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index ca7b1bb442d9..179468a00f5e 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -15,4 +15,3 @@ obj-$(CONFIG_FSP2)	+= fsp2.o
  obj-$(CONFIG_PCI)		+= pci.o
  obj-$(CONFIG_PPC4xx_HSTA_MSI)	+= hsta_msi.o
  obj-$(CONFIG_PPC4xx_CPM)	+= cpm.o
-obj-$(CONFIG_PPC4xx_GPIO)	+= gpio.o
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 020e51e30317..b87d2329900b 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -584,6 +584,13 @@ config GPIO_POLARFIRE_SOC
  	help
  	  Say yes here to support the GPIO controllers on Microchip FPGAs.
  
+config GPIO_PPC4XX
I'd prefer CONFIG_GPIO_PPC44X

That was added by 878e7556bfe7 ("powerpc/4xx: Add PowerPC 4xx GPIO 
driver") but since then 40x is gone with commit 47d13a269bbd 
("powerpc/40x: Remove 40x platforms.") so only 44x remains as depicted 
by commit 7bf5f0562b62 ("powerpc: Replace CONFIG_4xx with CONFIG_44x")
quoted hunk ↗ jump to hunk
+	tristate "PPC4xx GPIO support"
+	depends on 44x || (PPC && COMPILE_TEST)
+	select GPIO_GENERIC
+	help
+	  Enable gpiolib support for ppc440 based boards.
+
  config GPIO_PXA
  	bool "PXA GPIO support"
  	depends on ARCH_PXA || ARCH_MMP || COMPILE_TEST
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index b267598b517d..192242988ecb 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -145,6 +145,7 @@ obj-$(CONFIG_GPIO_PCIE_IDIO_24)		+= gpio-pcie-idio-24.o
  obj-$(CONFIG_GPIO_PCI_IDIO_16)		+= gpio-pci-idio-16.o
  obj-$(CONFIG_GPIO_PISOSR)		+= gpio-pisosr.o
  obj-$(CONFIG_GPIO_PL061)		+= gpio-pl061.o
+obj-$(CONFIG_GPIO_PPC4XX)		+= gpio-ppc4xx.o
  obj-$(CONFIG_GPIO_PMIC_EIC_SPRD)	+= gpio-pmic-eic-sprd.o
  obj-$(CONFIG_GPIO_POLARFIRE_SOC)	+= gpio-mpfs.o
  obj-$(CONFIG_GPIO_PXA)			+= gpio-pxa.o
diff --git a/arch/powerpc/platforms/44x/gpio.c b/drivers/gpio/gpio-ppc4xx.c
similarity index 100%
rename from arch/powerpc/platforms/44x/gpio.c
rename to drivers/gpio/gpio-ppc4xx.c
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help