projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
mach-davinci
/
da8xx-dt.c
diff --git
a/arch/arm/mach-davinci/da8xx-dt.c
b/arch/arm/mach-davinci/da8xx-dt.c
index ca997114b1f46a3e1eda3f552114ef4b458e4c1c..c9f7e9274aa8ace16cbd84d02c86b7efd9cccd20 100644
(file)
--- a/
arch/arm/mach-davinci/da8xx-dt.c
+++ b/
arch/arm/mach-davinci/da8xx-dt.c
@@
-37,6
+37,7
@@
static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",
NULL),
OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),
+ OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),
{}
};