pinctrl: sunxi: Move the Allwinner pinctrl driver to its own directory

This will allow to create numerous files without crippling the main pinctrl
directory.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 934fd89978d3c0e59abb18bbf80587eafe5fafcd..4508f6abee48562f51cab0f0d5172a4ac7ae6a6d 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -291,11 +291,6 @@ config PINCTRL_SIRF
        select PINMUX
        select GPIOLIB_IRQCHIP
 
-config PINCTRL_SUNXI
-       bool
-       select PINMUX
-       select GENERIC_PINCONF
-
 config PINCTRL_ST
        bool
        depends on OF
@@ -392,6 +387,7 @@ config PINCTRL_S3C64XX
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/sh-pfc/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"
+source "drivers/pinctrl/sunxi/Kconfig"
 source "drivers/pinctrl/vt8500/Kconfig"
 
 config PINCTRL_XWAY

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 68bb399fc5770f1168119b8a617bc2900c622573..c2621438785ed605908b04b4313f5d72707a5807 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_PINCTRL_PALMAS)  += pinctrl-palmas.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_SINGLE)   += pinctrl-single.o
 obj-$(CONFIG_PINCTRL_SIRF)     += sirf/
-obj-$(CONFIG_PINCTRL_SUNXI)    += pinctrl-sunxi.o
 obj-$(CONFIG_PINCTRL_TEGRA)    += pinctrl-tegra.o
 obj-$(CONFIG_PINCTRL_TEGRA20)  += pinctrl-tegra20.o
 obj-$(CONFIG_PINCTRL_TEGRA30)  += pinctrl-tegra30.o
@@ -75,3 +74,4 @@ obj-$(CONFIG_ARCH_SHMOBILE)   += sh-pfc/
 obj-$(CONFIG_SUPERH)           += sh-pfc/
 obj-$(CONFIG_PLAT_SPEAR)       += spear/
 obj-$(CONFIG_ARCH_VT8500)      += vt8500/
+obj-$(CONFIG_ARCH_SUNXI)       += sunxi/

diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
new file mode 100644 (file)
index 0000000..9d7d510
--- /dev/null
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -0,0 +1,8 @@
+if ARCH_SUNXI
+
+config PINCTRL_SUNXI
+       bool
+       select PINMUX
+       select GENERIC_PINCONF
+
+endif

diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
new file mode 100644 (file)
index 0000000..09a7621
--- /dev/null
+++ b/drivers/pinctrl/sunxi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PINCTRL_SUNXI)    += pinctrl-sunxi.o

diff --git a/drivers/pinctrl/pinctrl-sunxi-pins.h b/drivers/pinctrl/sunxi/pinctrl-sunxi-pins.h
similarity index 100%
rename from drivers/pinctrl/pinctrl-sunxi-pins.h
rename to drivers/pinctrl/sunxi/pinctrl-sunxi-pins.h

diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
similarity index 99%
rename from drivers/pinctrl/pinctrl-sunxi.c
rename to drivers/pinctrl/sunxi/pinctrl-sunxi.c
index f41c312673f41f96917be7ce08afa73d7327c405..c8b321ae6b172e99169617cf4df9de357a77d84f 100644 (file)
--- a/drivers/pinctrl/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -29,7 +29,7 @@
 #include <linux/reset.h>
 #include <linux/slab.h>
 
-#include "core.h"
+#include "../core.h"
 #include "pinctrl-sunxi.h"
 #include "pinctrl-sunxi-pins.h"
 

diff --git a/drivers/pinctrl/pinctrl-sunxi.h b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
similarity index 100%
rename from drivers/pinctrl/pinctrl-sunxi.h
rename to drivers/pinctrl/sunxi/pinctrl-sunxi.h