pinctrl: lynxpoint: Move GPIO driver to pin controller folder

Move Lynxpoint GPIO driver under Intel pin control umbrella
for further transformation to a real pin control driver.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bd5847e..6ea3cba 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8344,7 +8344,6 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 F:     drivers/gpio/gpio-ich.c
 F:     drivers/gpio/gpio-intel-mid.c
-F:     drivers/gpio/gpio-lynxpoint.c
 F:     drivers/gpio/gpio-merrifield.c
 F:     drivers/gpio/gpio-ml-ioh.c
 F:     drivers/gpio/gpio-pch.c

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 8adffd4..6923142 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -335,14 +335,6 @@ config GPIO_LPC32XX
          Select this option to enable GPIO driver for
          NXP LPC32XX devices.
 
-config GPIO_LYNXPOINT
-       tristate "Intel Lynxpoint GPIO support"
-       depends on ACPI && X86
-       select GPIOLIB_IRQCHIP
-       help
-         driver for GPIO functionality on Intel Lynxpoint PCH chipset
-         Requires ACPI device enumeration code to set up a platform device.
-
 config GPIO_MB86S7X
        tristate "GPIO support for Fujitsu MB86S7x Platforms"
        help

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 34eb8b2..55b2b64 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -76,7 +76,6 @@ obj-$(CONFIG_GPIO_LP873X)             += gpio-lp873x.o
 obj-$(CONFIG_GPIO_LP87565)             += gpio-lp87565.o
 obj-$(CONFIG_GPIO_LPC18XX)             += gpio-lpc18xx.o
 obj-$(CONFIG_GPIO_LPC32XX)             += gpio-lpc32xx.o
-obj-$(CONFIG_GPIO_LYNXPOINT)           += gpio-lynxpoint.o
 obj-$(CONFIG_GPIO_MADERA)              += gpio-madera.o
 obj-$(CONFIG_GPIO_MAX3191X)            += gpio-max3191x.o
 obj-$(CONFIG_GPIO_MAX7300)             += gpio-max7300.o

diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
index 6091947..c2e6bc9 100644 (file)
--- a/drivers/pinctrl/intel/Kconfig
+++ b/drivers/pinctrl/intel/Kconfig
@@ -31,6 +31,16 @@ config PINCTRL_CHERRYVIEW
          Cherryview/Braswell pinctrl driver provides an interface that
          allows configuring of SoC pins and using them as GPIOs.
 
+config PINCTRL_LYNXPOINT
+       tristate "Intel Lynxpoint pinctrl and GPIO driver"
+       depends on ACPI
+       select GPIOLIB
+       select GPIOLIB_IRQCHIP
+       help
+         Lynxpoint is the PCH of Intel Haswell. This pinctrl driver
+         provides an interface that allows configuring of PCH pins and
+         using them as GPIOs.
+
 config PINCTRL_MERRIFIELD
        tristate "Intel Merrifield pinctrl driver"
        depends on X86_INTEL_MID

diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile
index 7e620b4..f60f99c 100644 (file)
--- a/drivers/pinctrl/intel/Makefile
+++ b/drivers/pinctrl/intel/Makefile
@@ -3,6 +3,7 @@
 
 obj-$(CONFIG_PINCTRL_BAYTRAIL)         += pinctrl-baytrail.o
 obj-$(CONFIG_PINCTRL_CHERRYVIEW)       += pinctrl-cherryview.o
+obj-$(CONFIG_PINCTRL_LYNXPOINT)                += pinctrl-lynxpoint.o
 obj-$(CONFIG_PINCTRL_MERRIFIELD)       += pinctrl-merrifield.o
 obj-$(CONFIG_PINCTRL_INTEL)            += pinctrl-intel.o
 obj-$(CONFIG_PINCTRL_BROXTON)          += pinctrl-broxton.o

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
similarity index 100%
rename from drivers/gpio/gpio-lynxpoint.c
rename to drivers/pinctrl/intel/pinctrl-lynxpoint.c