summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2009-06-04 09:44:51 +0200
committerEric Miao <eric.y.miao@gmail.com>2009-06-05 04:50:26 +0200
commitb3992b665379c8de6f47cd0b0e5b3004d26b05be (patch)
treee001c9b1b69090a91389ec8721233dbc927c1914
parent[ARM] pxa/em-x270, cm-x270: use DEEPSLEEP for PM_SUSPEND_MEM (diff)
downloadlinux-b3992b665379c8de6f47cd0b0e5b3004d26b05be.tar.xz
linux-b3992b665379c8de6f47cd0b0e5b3004d26b05be.zip
[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>
-rw-r--r--arch/arm/mach-pxa/cm-x300.c1
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[] = {
static struct pxa3xx_nand_platform_data cm_x300_nand_info = {
.enable_arbiter = 1,
+ .keep_config = 1,
.parts = cm_x300_nand_partitions,
.nr_parts = ARRAY_SIZE(cm_x300_nand_partitions),
};