[PATCH v1 5/5] gpio: Move Intel vGPIO driver to the intel subfolder

[Andy Shevchenko <andriy.shevchenko@linux.intel.com>]

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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                   |  1 -
 drivers/gpio/Kconfig                          | 18 ------------------
 drivers/gpio/Makefile                         |  1 -
 drivers/gpio/intel/Kconfig                    | 18 ++++++++++++++++++
 drivers/gpio/intel/Makefile                   |  2 ++
 drivers/gpio/{ => intel}/gpio-graniterapids.c |  0
 6 files changed, 20 insertions(+), 20 deletions(-)
 rename drivers/gpio/{ => intel}/gpio-graniterapids.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index b3f9f20f8264..fdd451ada851 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13131,7 +13131,6 @@ M:	Andy Shevchenko <andy@kernel.org>
 L:	linux-gpio@vger.kernel.org
 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/intel/
 
 INTEL GPIO GPE DRIVER
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 0353226cb2d7..4b092786ec3b 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -362,24 +362,6 @@ config GPIO_GENERIC_PLATFORM
 	help
 	  Say yes here to support basic platform_device memory-mapped GPIO controllers.
 
-config GPIO_GRANITERAPIDS
-	tristate "Intel Granite Rapids-D vGPIO support"
-	depends on X86 || COMPILE_TEST
-	select GPIOLIB_IRQCHIP
-	help
-	  Select this to enable virtual GPIO support on platforms with the
-	  following SoCs:
-
-	  - Intel Granite Rapids-D
-
-	  The driver enables basic GPIO functionality and implements interrupt
-	  support. The virtual GPIO driver controls GPIO lines via a firmware
-	  interface. The physical GPIO pins reside on device that is external
-	  from the main SoC package, such as a BMC or a CPLD.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called gpio-graniterapids.
-
 config GPIO_GRGPIO
 	tristate "Aeroflex Gaisler GRGPIO support"
 	depends on OF || COMPILE_TEST
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ba01904588d9..8e24a6f7d193 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -74,7 +74,6 @@ obj-$(CONFIG_GPIO_FTGPIO010)		+= gpio-ftgpio010.o
 obj-$(CONFIG_GPIO_FXL6408)		+= gpio-fxl6408.o
 obj-$(CONFIG_GPIO_GE_FPGA)		+= gpio-ge.o
 obj-$(CONFIG_GPIO_GPIO_MM)		+= gpio-gpio-mm.o
-obj-$(CONFIG_GPIO_GRANITERAPIDS)	+= gpio-graniterapids.o
 obj-$(CONFIG_GPIO_GRGPIO)		+= gpio-grgpio.o
 obj-$(CONFIG_GPIO_GW_PLD)		+= gpio-gw-pld.o
 obj-$(CONFIG_GPIO_HISI)                 += gpio-hisi.o
diff --git a/drivers/gpio/intel/Kconfig b/drivers/gpio/intel/Kconfig
index 54fc93b362c6..39e71c7dd71a 100644
--- a/drivers/gpio/intel/Kconfig
+++ b/drivers/gpio/intel/Kconfig
@@ -5,6 +5,24 @@
 
 if HAS_IOMEM
 
+config GPIO_GRANITERAPIDS
+	tristate "Intel Granite Rapids-D vGPIO support"
+	depends on X86 || COMPILE_TEST
+	select GPIOLIB_IRQCHIP
+	help
+	  Select this to enable virtual GPIO support on platforms with the
+	  following SoCs:
+
+	  - Intel Granite Rapids-D
+
+	  The driver enables basic GPIO functionality and implements interrupt
+	  support. The virtual GPIO driver controls GPIO lines via a firmware
+	  interface. The physical GPIO pins reside on device that is external
+	  from the main SoC package, such as a BMC or a CPLD.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called gpio-graniterapids.
+
 config GPIO_TANGIER
 	tristate
 	select GPIOLIB_IRQCHIP
diff --git a/drivers/gpio/intel/Makefile b/drivers/gpio/intel/Makefile
index cb373d25b56e..f4b24e7e7b02 100644
--- a/drivers/gpio/intel/Makefile
+++ b/drivers/gpio/intel/Makefile
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 # Intel GPIO drivers
 
+obj-$(CONFIG_GPIO_GRANITERAPIDS)	+= gpio-graniterapids.o
+
 obj-$(CONFIG_GPIO_TANGIER)		+= gpio-tangier.o
 obj-$(CONFIG_GPIO_ELKHARTLAKE)		+= gpio-elkhartlake.o
 obj-$(CONFIG_GPIO_MERRIFIELD)		+= gpio-merrifield.o
diff --git a/drivers/gpio/gpio-graniterapids.c b/drivers/gpio/intel/gpio-graniterapids.c
similarity index 100%
rename from drivers/gpio/gpio-graniterapids.c
rename to drivers/gpio/intel/gpio-graniterapids.c
-- 
2.50.1