Commit 92183103 authored by Andrea Adami's avatar Andrea Adami Committed by Russell King
Browse files

ARM: 8084/1: sa1100: collie: revert back to cfi_probe

Reverts commit d26b17ed

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: default avatarAndrea Adami <>
Signed-off-by: default avatarRussell King <>
parent d0ba7cc0
......@@ -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,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment