Commit ca402d37 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: move the U300 GPIO driver to pinctrl 



This driver will be converted to a dual GPIO + pinctrl driver
since it supports biasing and driving control options. Hopefully
it can serve as an example.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dd68acc7

arch/arm/mach-u300/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config MACH_U300 
	bool "U300"

	select PINCTRL

	select PINMUX_U300

	select GPIO_U300

	select PINCTRL_COH901



comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"

arch/arm/mach-u300/include/mach/irqs.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
#endif



/* Maximum 8*7 GPIO lines */

#ifdef CONFIG_GPIO_U300

#ifdef CONFIG_PINCTRL_COH901

#define IRQ_U300_GPIO_BASE		(U300_VIC_IRQS_END)

#define IRQ_U300_GPIO_END		(IRQ_U300_GPIO_BASE + 56)

#else

drivers/gpio/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -170,15 +170,6 @@ config GPIO_SCH 
	  The Intel Tunnel Creek processor has 5 GPIOs powered by the

	  core power rail and 9 from suspend power supply.



config GPIO_U300

	bool "ST-Ericsson U300 COH 901 335/571 GPIO"

	depends on GPIOLIB && ARCH_U300

	help

	  Say yes here to support GPIO interface on ST-Ericsson U300.

	  The names of the two IP block variants supported are

	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7

	  ports of 8 GPIO pins each.



config GPIO_VX855

	tristate "VIA VX855/VX875 GPIO"

	depends on PCI

drivers/gpio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ obj-$(CONFIG_ARCH_DAVINCI_TNETV107X) += gpio-tnetv107x.o 
obj-$(CONFIG_GPIO_TPS65910)	+= gpio-tps65910.o

obj-$(CONFIG_GPIO_TPS65912)	+= gpio-tps65912.o

obj-$(CONFIG_GPIO_TWL4030)	+= gpio-twl4030.o

obj-$(CONFIG_MACH_U300)		+= gpio-u300.o

obj-$(CONFIG_GPIO_UCB1400)	+= gpio-ucb1400.o

obj-$(CONFIG_GPIO_VR41XX)	+= gpio-vr41xx.o

obj-$(CONFIG_GPIO_VX855)	+= gpio-vx855.o

drivers/pinctrl/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -30,6 +30,15 @@ config PINMUX_U300 
	depends on ARCH_U300

	select PINMUX



config PINCTRL_COH901

	bool "ST-Ericsson U300 COH 901 335/571 GPIO"

	depends on GPIOLIB && ARCH_U300

	help

	  Say yes here to support GPIO interface on ST-Ericsson U300.

	  The names of the two IP block variants supported are

	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7

	  ports of 8 GPIO pins each.



endmenu



endif