diff options
author | Mike Rapoport <mike@compulab.co.il> | 2009-06-04 03:44:51 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-04 22:50:26 -0400 |
commit | b3992b665379c8de6f47cd0b0e5b3004d26b05be (patch) | |
tree | e001c9b1b69090a91389ec8721233dbc927c1914 /arch | |
parent | 9599d1dbc2264355ecad0bae76bf6c1236c84c73 (diff) |
[ARM] pxa/cm-x300: use OBM configuration for NAND flash
CM-X300 can be assembled with different NAND flashes from different
manufacturers. Adding their configuration to the kernel is impractical,
therefore we will use the default NAND controller settings set up by the
bootloader.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index a97f87a90d0d..5295304731f6 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -265,6 +265,7 @@ static struct mtd_partition cm_x300_nand_partitions[] = { | |||
265 | 265 | ||
266 | static struct pxa3xx_nand_platform_data cm_x300_nand_info = { | 266 | static struct pxa3xx_nand_platform_data cm_x300_nand_info = { |
267 | .enable_arbiter = 1, | 267 | .enable_arbiter = 1, |
268 | .keep_config = 1, | ||
268 | .parts = cm_x300_nand_partitions, | 269 | .parts = cm_x300_nand_partitions, |
269 | .nr_parts = ARRAY_SIZE(cm_x300_nand_partitions), | 270 | .nr_parts = ARRAY_SIZE(cm_x300_nand_partitions), |
270 | }; | 271 | }; |