summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2013-09-16 00:04:42 +0200
committerOlof Johansson <olof@lixom.net>2013-09-18 08:20:27 -0700
commitd26b17edafc45187c30cae134a5e5429d58ad676 (patch)
treebbb30c8e6ca52d6f29ca8cf805ee7e9b22a34ffe /arch/arm/mach-sa1100
parentc8a5b7bc75342542ce5e3556780e8a03357ff686 (diff)
downloadop-kernel-dev-d26b17edafc45187c30cae134a5e5429d58ad676.zip
op-kernel-dev-d26b17edafc45187c30cae134a5e5429d58ad676.tar.gz
ARM: sa1100: collie.c: fall back to jedec_probe flash detection
Zaurus collie contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and at the moment cfi will not detect the collie NOR. In the meanwhile we can revert to the jedec-probe map which has been fixed with following commit: mtd: jedec_probe: fix LH28F640BF definition fe2f4c8e0bf2756b670ee78fa9772613a2ea8495 Somehow this is unsatisfactory because the flash is mounted READ ONLY (as from factory, with a RO cramfs) Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/collie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 612a456..7fb96eb 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -289,7 +289,7 @@ static void collie_flash_exit(void)
}
static struct flash_platform_data collie_flash_data = {
- .map_name = "cfi_probe",
+ .map_name = "jedec_probe",
.init = collie_flash_init,
.set_vpp = collie_set_vpp,
.exit = collie_flash_exit,
OpenPOWER on IntegriCloud