diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2014-06-25 23:31:15 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-29 11:29:33 +0200 |
| commit | 92183103d87dfa929696187e4ed6be67f56a2f3a (patch) | |
| tree | f0b872f89314c9ad3ae053f8b3439d9e9cac6406 /arch/arm/mach-sa1100/collie.c | |
| parent | ARM: 8080/1: mcpm.h: remove unused variable declaration (diff) | |
| download | linux-92183103d87dfa929696187e4ed6be67f56a2f3a.tar.xz linux-92183103d87dfa929696187e4ed6be67f56a2f3a.zip | |
ARM: 8084/1: sa1100: collie: revert back to cfi_probe
Reverts commit d26b17edafc45187c30cae134a5e5429d58ad676
ARM: sa1100: collie.c: fall back to jedec_probe flash detection
Unfortunately the detection was challenged on the defective unit used for tests:
one of the NOR chips did not respond to the CFI query.
Moreover that bad device needed extra delays on erase-suspend/resume cycles.
Tested personally on 3 different units and with feedback of two other users.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index f9874ba60cc8..f26aeeab9e14 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -356,7 +356,7 @@ static void collie_flash_exit(void) } static struct flash_platform_data collie_flash_data = { - .map_name = "jedec_probe", + .map_name = "cfi_probe", .init = collie_flash_init, .set_vpp = collie_set_vpp, .exit = collie_flash_exit, |