From 35957eda21bdd2f22c84fa269c1b856f5039c308 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 12 Nov 2013 22:32:26 +0100 Subject: [PATCH] sa1100: collie: detect NOR again with cfi_probe Ehile the detection is still forced we switch away from jedec: the CFI code allows us to set the necessary fixups. Signed-off-by: Andrea Adami --- arch/arm/mach-sa1100/collie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 799902d..8c088cc 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -326,7 +326,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, -- 1.8.1.5