diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-11-19 16:46:33 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 15:01:57 -0500 |
commit | 8cf50a245152ae9294ccc2a24e51641a842c2c24 (patch) | |
tree | dfc5dc892fbc34b1fee5112c98de8f74dfe1a7e4 /arch/arm/mach-ux500 | |
parent | 7e0632a5262f0a23644df7aad7132ec46530aff9 (diff) |
ARM: ux500: delete Nomadik pinctrl AUXDATA
This deletes the AUXDATA hammering down the Nomadik pin
controller name to "pinctrl-db8500". We have removed all
dependencies on this name.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 0b5b27b4a7b4..840452b89fc2 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
23 | #include <linux/regulator/machine.h> | 23 | #include <linux/regulator/machine.h> |
24 | #include <linux/platform_data/pinctrl-nomadik.h> | ||
25 | #include <linux/random.h> | 24 | #include <linux/random.h> |
26 | 25 | ||
27 | #include <asm/pmu.h> | 26 | #include <asm/pmu.h> |
@@ -167,9 +166,6 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { | |||
167 | OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL), | 166 | OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL), |
168 | OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0", | 167 | OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0", |
169 | NULL), | 168 | NULL), |
170 | /* Requires device name bindings. */ | ||
171 | OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE, | ||
172 | "pinctrl-db8500", NULL), | ||
173 | {}, | 169 | {}, |
174 | }; | 170 | }; |
175 | 171 | ||