aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-innovator.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
-rw-r--r--arch/arm/mach-omap1/board-innovator.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 2133b006f6a3..5d12fd35681b 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -22,16 +22,17 @@
22#include <linux/delay.h> 22#include <linux/delay.h>
23#include <linux/mtd/mtd.h> 23#include <linux/mtd/mtd.h>
24#include <linux/mtd/partitions.h> 24#include <linux/mtd/partitions.h>
25#include <linux/mtd/physmap.h>
25#include <linux/input.h> 26#include <linux/input.h>
26#include <linux/smc91x.h> 27#include <linux/smc91x.h>
27 28
28#include <mach/hardware.h> 29#include <mach/hardware.h>
29#include <asm/mach-types.h> 30#include <asm/mach-types.h>
30#include <asm/mach/arch.h> 31#include <asm/mach/arch.h>
31#include <asm/mach/flash.h>
32#include <asm/mach/map.h> 32#include <asm/mach/map.h>
33 33
34#include <plat/mux.h> 34#include <plat/mux.h>
35#include <plat/flash.h>
35#include <plat/fpga.h> 36#include <plat/fpga.h>
36#include <mach/gpio.h> 37#include <mach/gpio.h>
37#include <plat/tc.h> 38#include <plat/tc.h>
@@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = {
94 } 95 }
95}; 96};
96 97
97static struct flash_platform_data innovator_flash_data = { 98static struct physmap_flash_data innovator_flash_data = {
98 .map_name = "cfi_probe",
99 .width = 2, 99 .width = 2,
100 .set_vpp = omap1_set_vpp,
100 .parts = innovator_partitions, 101 .parts = innovator_partitions,
101 .nr_parts = ARRAY_SIZE(innovator_partitions), 102 .nr_parts = ARRAY_SIZE(innovator_partitions),
102}; 103};
@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = {
108}; 109};
109 110
110static struct platform_device innovator_flash_device = { 111static struct platform_device innovator_flash_device = {
111 .name = "omapflash", 112 .name = "physmap-flash",
112 .id = 0, 113 .id = 0,
113 .dev = { 114 .dev = {
114 .platform_data = &innovator_flash_data, 115 .platform_data = &innovator_flash_data,