diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:46:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:46:35 +0200 |
| commit | 78a0bc3de149fd162ff3ae4bd264531ef9ad565f (patch) | |
| tree | ef44c0a32b37ac8ed138420a807d5245278e1d7b /arch/arm | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 0f74da3f4bd91da4f8d3f79c9dc39a781cc7ae82 (diff) | |
| download | op-kernel-dev-78a0bc3de149fd162ff3ae4bd264531ef9ad565f.zip op-kernel-dev-78a0bc3de149fd162ff3ae4bd264531ef9ad565f.tar.gz | |
Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards
* 'board' of git://github.com/hzhuang1/linux:
ARM: ttc_dkb: add nand support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 7a7de2b..ce55fd8 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c @@ -177,12 +177,22 @@ static struct mv_usb_platform_data ttc_usb_pdata = { #endif #endif +#ifdef CONFIG_MTD_NAND_PXA3xx +static struct pxa3xx_nand_platform_data dkb_nand_info = { + .enable_arbiter = 1, + .num_cs = 1, +}; +#endif + static void __init ttc_dkb_init(void) { mfp_config(ARRAY_AND_SIZE(ttc_dkb_pin_config)); /* on-chip devices */ pxa910_add_uart(1); +#ifdef CONFIG_MTD_NAND_PXA3xx + pxa910_add_nand(&dkb_nand_info); +#endif /* off-chip devices */ pxa910_add_twsi(0, NULL, ARRAY_AND_SIZE(ttc_dkb_i2c_info)); |
