[PATCH 7/8] ARM: aaec2000: Use physmap driver instead of integrator-flash
From: Marc Zyngier <hidden>
Date: 2011-01-05 14:06:39
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Signed-off-by: Marc Zyngier <redacted> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Nicolas Bellido <redacted> --- arch/arm/mach-aaec2000/core.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index 3ef6833..100707c 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c@@ -21,12 +21,12 @@ #include <linux/signal.h> #include <linux/clk.h> #include <linux/gfp.h> +#include <linux/mtd/physmap.h> #include <mach/hardware.h> #include <asm/irq.h> #include <asm/sizes.h> -#include <asm/mach/flash.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> #include <asm/mach/map.h>
@@ -260,8 +260,7 @@ void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) memcpy(&mach_clcd_panel, &clcd->panel, sizeof(struct clcd_panel)); } -static struct flash_platform_data aaec2000_flash_data = { - .map_name = "cfi_probe", +static struct physmap_flash_data aaec2000_flash_data = { .width = 4, };
@@ -272,7 +271,7 @@ static struct resource aaec2000_flash_resource = { }; static struct platform_device aaec2000_flash_device = { - .name = "armflash", + .name = "physmap-flash", .id = 0, .dev = { .platform_data = &aaec2000_flash_data,
--
1.7.0.4