diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-11-16 09:22:59 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-01-03 09:10:03 +0100 |
| commit | ca402d37dccf2b797440c5f03bd0db16f977acc9 (patch) | |
| tree | 7dee0cb62c951122dea275a680da837ee81f69d0 /arch/arm/mach-u300 | |
| parent | dd68acc7cc256c928256eb5f53e163233605de5d (diff) | |
| download | talos-op-linux-ca402d37dccf2b797440c5f03bd0db16f977acc9.tar.gz talos-op-linux-ca402d37dccf2b797440c5f03bd0db16f977acc9.zip | |
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: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index 1cbcd4fc1e17..c2d5c6c08364 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -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" diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index db3fbfa1d6e9..ee78a26707eb 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h @@ -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 |
