Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dffe1d4 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sunxi-pinctrl-for-3.16' of https://github.com/mripard/linux into devel

Pinctrl cleanup and reworks for 3.16

This serie of patch:
  - Moves the Allwinner pinctrl driver to a folder of its own
  - removes the sunxi-pinctrl-pins header, and split the driver into a core
    one, with all the logic, and smaller drivers, one for each SoC, that
    declare the pins, and will provide to the core the set of pins.
  - And does a few cleanups here and there.
parents 2aa02733 dc969106
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/
+0 −3937

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/pinctrl-sunxi.h

deleted100644 → 0
+0 −617

File deleted.

Preview size limit exceeded, changes collapsed.

+32 −0
Original line number Diff line number Diff line
if ARCH_SUNXI

config PINCTRL_SUNXI
	bool
	select PINMUX
	select GENERIC_PINCONF

config PINCTRL_SUN4I_A10
       bool
       select PINCTRL_SUNXI

config PINCTRL_SUN5I_A10S
       bool
       select PINCTRL_SUNXI

config PINCTRL_SUN5I_A13
       bool
       select PINCTRL_SUNXI

config PINCTRL_SUN6I_A31
       bool
       select PINCTRL_SUNXI

config PINCTRL_SUN6I_A31_R
       bool
       select PINCTRL_SUNXI

config PINCTRL_SUN7I_A20
       bool
       select PINCTRL_SUNXI

endif
Loading