summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-08-23 11:29:22 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 11:08:00 +0200
commit2120c3bfc5c5fbd12a851d5823c8e1e01deccfe7 (patch)
tree129e7f64c583ea3b7baad357b93220b0b821d402
parentARM: ux500: Purge support for registering the RTC when booting with ATAGs (diff)
downloadlinux-2120c3bfc5c5fbd12a851d5823c8e1e01deccfe7.tar.xz
linux-2120c3bfc5c5fbd12a851d5823c8e1e01deccfe7.zip
ARM: ux500: Stop registering Pinctrl when booting with ATAG support
It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c1
-rw-r--r--arch/arm/mach-ux500/devices-common.h18
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d98ddb361e85..93b92d483949 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -159,7 +159,6 @@ static void __init db8500_add_gpios(struct device *parent)
dbx500_add_gpios(parent, db8500_gpio_base,
ARRAY_SIZE(db8500_gpio_base),
IRQ_DB8500_GPIO0, &pdata);
- dbx500_add_pinctrl(parent, "pinctrl-db8500", U8500_PRCMU_BASE);
}
static const char *db8500_read_soc_id(void)
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 360112e2e23a..7167b6951c53 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -38,22 +38,4 @@ struct nmk_gpio_platform_data;
void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
int irq, struct nmk_gpio_platform_data *pdata);
-static inline void
-dbx500_add_pinctrl(struct device *parent, const char *name,
- resource_size_t base)
-{
- struct resource res[] = {
- DEFINE_RES_MEM(base, SZ_8K),
- };
- struct platform_device_info pdevinfo = {
- .parent = parent,
- .name = name,
- .id = -1,
- .res = res,
- .num_res = ARRAY_SIZE(res),
- };
-
- platform_device_register_full(&pdevinfo);
-}
-
#endif