summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij2013-04-22 11:00:02 +0200
committerLinus Walleij2013-06-17 13:54:29 +0200
commitd134636f370070f0aa43bb4b145ed60c440eff17 (patch)
tree45e7358617044e9fad04fe3bed24eff08ac95266 /arch/arm/mach-u300
parentARM: u300: probe the U300 dummy-spichip from device tree (diff)
downloadkernel-qcow2-linux-d134636f370070f0aa43bb4b145ed60c440eff17.tar.gz
kernel-qcow2-linux-d134636f370070f0aa43bb4b145ed60c440eff17.tar.xz
kernel-qcow2-linux-d134636f370070f0aa43bb4b145ed60c440eff17.zip
ARM: u300: add FSMC flash into the device tree
This registers the U300 FSMC flash controller from the device tree, and defines the three partitions. Skip the BBT scan as in the current platform data. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index d102cb501f8d..8f9e77aea76a 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -733,6 +733,8 @@ static struct of_dev_auxdata u300_auxdata_lookup[] __initdata = {
"rtc-coh901331", NULL),
OF_DEV_AUXDATA("stericsson,coh901318", U300_DMAC_BASE,
"coh901318", NULL),
+ OF_DEV_AUXDATA("stericsson,fsmc-nand", U300_NAND_IF_PHYS_BASE,
+ "fsmc-nand", NULL),
OF_DEV_AUXDATA("arm,primecell", U300_UART0_BASE,
"uart0", &uart0_plat_data),
OF_DEV_AUXDATA("arm,primecell", U300_UART1_BASE,