OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e0632a
)
ARM: ux500: delete Nomadik pinctrl AUXDATA
author
Linus Walleij
<linus.walleij@linaro.org>
Tue, 19 Nov 2013 21:46:33 +0000
(22:46 +0100)
committer
Linus Walleij
<linus.walleij@linaro.org>
Tue, 26 Nov 2013 20:01:57 +0000
(21:01 +0100)
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>
arch/arm/mach-ux500/cpu-db8500.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-ux500/cpu-db8500.c
b/arch/arm/mach-ux500/cpu-db8500.c
index
0b5b27b
..
840452b
100644
(file)
--- a/
arch/arm/mach-ux500/cpu-db8500.c
+++ b/
arch/arm/mach-ux500/cpu-db8500.c
@@
-21,7
+21,6
@@
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/regulator/machine.h>
-#include <linux/platform_data/pinctrl-nomadik.h>
#include <linux/random.h>
#include <asm/pmu.h>
@@
-167,9
+166,6
@@
static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
NULL),
- /* Requires device name bindings. */
- OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,
- "pinctrl-db8500", NULL),
{},
};