gpio: Move Intel vGPIO driver to the intel subfolder For better maintenance and development experience, move Intel vGPIO driver to the intel subfolder. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
diff --git a/MAINTAINERS b/MAINTAINERS index 801f4e4..ee30963 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -13422,7 +13422,6 @@ 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 ca32699..0cef1e5 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig
@@ -383,24 +383,6 @@ 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 44782aaa..3726149 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile
@@ -77,7 +77,6 @@ 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 54fc93b..39e71c7 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 cb373d2..f4b24e7 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