[PATCH v1 4/5] gpio: Move Intel Sodaville GPIO driver to the intel subfolder

[Andy Shevchenko]

For better maintenance and development experience, move
Intel Sodaville GPIO driver to the intel subfolder.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
 MAINTAINERS                               | 1 -
 drivers/gpio/Kconfig                      | 8 --------
 drivers/gpio/Makefile                     | 1 -
 drivers/gpio/intel/Kconfig                | 9 +++++++++
 drivers/gpio/intel/Makefile               | 2 ++
 drivers/gpio/{ => intel}/gpio-sodaville.c | 0
 6 files changed, 11 insertions(+), 10 deletions(-)
 rename drivers/gpio/{ => intel}/gpio-sodaville.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index e1e4d64a5960..b3f9f20f8264 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13132,7 +13132,6 @@ L:	linux-gpio@xxxxxxxxxxxxxxx
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:	drivers/gpio/gpio-graniterapids.c
-F:	drivers/gpio/gpio-sodaville.c
 F:	drivers/gpio/intel/
 
 INTEL GPIO GPE DRIVER
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 25d6e66bc4fc..0353226cb2d7 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1837,14 +1837,6 @@ config GPIO_RDC321X
 	  Support for the RDC R321x SoC GPIOs over southbridge
 	  PCI configuration space.
 
-config GPIO_SODAVILLE
-	bool "Intel Sodaville GPIO support"
-	depends on X86 && OF
-	select GPIO_GENERIC
-	select GENERIC_IRQ_CHIP
-	help
-	  Say Y here to support Intel Sodaville GPIO.
-
 endmenu
 
 menu "SPI GPIO expanders"
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 819583fc0d0b..ba01904588d9 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -167,7 +167,6 @@ obj-$(CONFIG_GPIO_SIM)			+= gpio-sim.o
 obj-$(CONFIG_GPIO_SIOX)			+= gpio-siox.o
 obj-$(CONFIG_GPIO_SL28CPLD)		+= gpio-sl28cpld.o
 obj-$(CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER) += gpio-sloppy-logic-analyzer.o
-obj-$(CONFIG_GPIO_SODAVILLE)		+= gpio-sodaville.o
 obj-$(CONFIG_GPIO_SPACEMIT_K1)		+= gpio-spacemit-k1.o
 obj-$(CONFIG_GPIO_SPEAR_SPICS)		+= gpio-spear-spics.o
 obj-$(CONFIG_GPIO_SPRD)			+= gpio-sprd.o
diff --git a/drivers/gpio/intel/Kconfig b/drivers/gpio/intel/Kconfig
index ad8321ef1705..54fc93b362c6 100644
--- a/drivers/gpio/intel/Kconfig
+++ b/drivers/gpio/intel/Kconfig
@@ -36,6 +36,15 @@ config GPIO_MERRIFIELD
 
 endif
 
+config GPIO_SODAVILLE
+	bool "Intel Sodaville GPIO support"
+	depends on X86 && OF
+	depends on PCI
+	select GPIO_GENERIC
+	select GENERIC_IRQ_CHIP
+	help
+	  Say Y here to support Intel Sodaville GPIO.
+
 # PCH type of drivers
 
 if PCI
diff --git a/drivers/gpio/intel/Makefile b/drivers/gpio/intel/Makefile
index 26704fc1fa1a..cb373d25b56e 100644
--- a/drivers/gpio/intel/Makefile
+++ b/drivers/gpio/intel/Makefile
@@ -5,6 +5,8 @@ obj-$(CONFIG_GPIO_TANGIER)		+= gpio-tangier.o
 obj-$(CONFIG_GPIO_ELKHARTLAKE)		+= gpio-elkhartlake.o
 obj-$(CONFIG_GPIO_MERRIFIELD)		+= gpio-merrifield.o
 
+obj-$(CONFIG_GPIO_SODAVILLE)		+= gpio-sodaville.o
+
 # PCH type of drivers
 
 obj-$(CONFIG_GPIO_ICH)			+= gpio-ich.o
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/intel/gpio-sodaville.c
similarity index 100%
rename from drivers/gpio/gpio-sodaville.c
rename to drivers/gpio/intel/gpio-sodaville.c
-- 
2.50.1