Skip to content

Commit

Permalink
pinctrl: sunxi: Move the Allwinner pinctrl driver to its own directory
Browse files Browse the repository at this point in the history
This will allow to create numerous files without crippling the main pinctrl
directory.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Maxime Ripard committed May 4, 2014
1 parent 0df6846 commit 5f91077
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 7 deletions.
6 changes: 1 addition & 5 deletions drivers/pinctrl/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 changes: 8 additions & 0 deletions drivers/pinctrl/sunxi/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
if ARCH_SUNXI

config PINCTRL_SUNXI
bool
select PINMUX
select GENERIC_PINCONF

endif
1 change: 1 addition & 0 deletions drivers/pinctrl/sunxi/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-$(CONFIG_PINCTRL_SUNXI) += pinctrl-sunxi.o
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes.

0 comments on commit 5f91077

Please sign in to comment.