Browse Source

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>
Maxime Ripard 11 years ago
parent
commit
5f9107774f

+ 1 - 5
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

+ 1 - 1
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/

+ 8 - 0
drivers/pinctrl/sunxi/Kconfig

@@ -0,0 +1,8 @@
+if ARCH_SUNXI
+
+config PINCTRL_SUNXI
+	bool
+	select PINMUX
+	select GENERIC_PINCONF
+
+endif

+ 1 - 0
drivers/pinctrl/sunxi/Makefile

@@ -0,0 +1 @@
+obj-$(CONFIG_PINCTRL_SUNXI)	+= pinctrl-sunxi.o

+ 0 - 0
drivers/pinctrl/pinctrl-sunxi-pins.h → drivers/pinctrl/sunxi/pinctrl-sunxi-pins.h


+ 1 - 1
drivers/pinctrl/pinctrl-sunxi.c → 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"
 

+ 0 - 0
drivers/pinctrl/pinctrl-sunxi.h → drivers/pinctrl/sunxi/pinctrl-sunxi.h