ARM: 8084/1: sa1100: collie: revert back to cfi_probe
authorAndrea Adami <andrea.adami@gmail.com>
Wed, 25 Jun 2014 21:31:15 +0000 (22:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 29 Jun 2014 09:29:33 +0000 (10:29 +0100)
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>
arch/arm/mach-sa1100/collie.c

index f9874ba60cc84a6347f0f6bf7b18d1434c886c9f..f26aeeab9e145f4873e622e399c341229ac4a26b 100644 (file)
@@ -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,