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

andrea-adami · Russell King · commit 92183103d87d · 2014-06-29T10:29:33.000+01:00
Reverts commit d26b17e 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>
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ static void collie_flash_exit(void)`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`static struct flash_platform_data collie_flash_data = {`
`359`		`- .map_name = "jedec_probe",`
	`359`	`+ .map_name = "cfi_probe",`
`360`	`360`	`.init = collie_flash_init,`
`361`	`361`	`.set_vpp = collie_set_vpp,`
`362`	`362`	`.exit = collie_flash_exit,`