pinctrl: Move Intel Baytrail pinctrl driver under intel directory

We are going to have more pinctrl drivers for Intel hardware so separate
all our pin controller drivers to own directory.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c6a66de6ed72d0d4e96d061737d4ba3b9a4f3cd3..d014f22f387a71ed0d4b720d6cb52d086eb36eb3 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -67,18 +67,6 @@ config PINCTRL_AT91
        help
          Say Y here to enable the at91 pinctrl driver
 
-config PINCTRL_BAYTRAIL
-       bool "Intel Baytrail GPIO pin control"
-       depends on GPIOLIB && ACPI && X86
-       select GPIOLIB_IRQCHIP
-       help
-         driver for memory mapped GPIO functionality on Intel Baytrail
-         platforms. Supports 3 banks with 102, 28 and 44 gpios.
-         Most pins are usually muxed to some other functionality by firmware,
-         so only a small amount is available for gpio use.
-
-         Requires ACPI device enumeration code to set up a platform device.
-
 config PINCTRL_BCM2835
        bool
        select PINMUX
@@ -205,6 +193,7 @@ config PINCTRL_PALMAS
 
 source "drivers/pinctrl/berlin/Kconfig"
 source "drivers/pinctrl/freescale/Kconfig"
+source "drivers/pinctrl/intel/Kconfig"
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/nomadik/Kconfig"
 source "drivers/pinctrl/qcom/Kconfig"

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 51f52d32859e22c4c26ae0496dd90445e5fc2614..c030b3db80348478d41a23564db0e078f4ad13f1 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_PINCTRL_BF54x)   += pinctrl-adi2-bf54x.o
 obj-$(CONFIG_PINCTRL_BF60x)    += pinctrl-adi2-bf60x.o
 obj-$(CONFIG_PINCTRL_AT91)     += pinctrl-at91.o
 obj-$(CONFIG_PINCTRL_BCM2835)  += pinctrl-bcm2835.o
-obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o
 obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o
 obj-$(CONFIG_PINCTRL_FALCON)   += pinctrl-falcon.o
 obj-$(CONFIG_PINCTRL_PALMAS)   += pinctrl-palmas.o
@@ -39,6 +38,7 @@ obj-$(CONFIG_PINCTRL_ST)      += pinctrl-st.o
 
 obj-$(CONFIG_ARCH_BERLIN)      += berlin/
 obj-y                          += freescale/
+obj-$(CONFIG_X86)              += intel/
 obj-$(CONFIG_PLAT_ORION)        += mvebu/
 obj-y                          += nomadik/
 obj-$(CONFIG_ARCH_QCOM)                += qcom/

diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
new file mode 100644 (file)
index 0000000..957c903
--- /dev/null
+++ b/drivers/pinctrl/intel/Kconfig
@@ -0,0 +1,15 @@
+#
+# Intel pin control drivers
+#
+
+config PINCTRL_BAYTRAIL
+       bool "Intel Baytrail GPIO pin control"
+       depends on GPIOLIB && ACPI
+       select GPIOLIB_IRQCHIP
+       help
+         driver for memory mapped GPIO functionality on Intel Baytrail
+         platforms. Supports 3 banks with 102, 28 and 44 gpios.
+         Most pins are usually muxed to some other functionality by firmware,
+         so only a small amount is available for gpio use.
+
+         Requires ACPI device enumeration code to set up a platform device.

diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile
new file mode 100644 (file)
index 0000000..d049b76
--- /dev/null
+++ b/drivers/pinctrl/intel/Makefile
@@ -0,0 +1,3 @@
+# Intel pin control drivers
+
+obj-$(CONFIG_PINCTRL_BAYTRAIL)         += pinctrl-baytrail.o

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