Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 <andrea.adami@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d0ba7cc0

arch/arm/mach-sa1100/collie.c

+1 −1
Original line number Diff line number Diff line
@@ -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,