diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 1387a4f15da9..e854d5741c88 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -18,19 +18,20 @@ | |||
18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
19 | #include <linux/mtd/nand.h> | 19 | #include <linux/mtd/nand.h> |
20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
21 | #include <linux/mtd/physmap.h> | ||
21 | #include <linux/input.h> | 22 | #include <linux/input.h> |
22 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
23 | 24 | ||
24 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
25 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
26 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
27 | #include <asm/mach/flash.h> | ||
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
29 | 29 | ||
30 | #include <plat/tc.h> | 30 | #include <plat/tc.h> |
31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
32 | #include <plat/mux.h> | 32 | #include <plat/mux.h> |
33 | #include <plat/fpga.h> | 33 | #include <plat/fpga.h> |
34 | #include <plat/flash.h> | ||
34 | #include <plat/keypad.h> | 35 | #include <plat/keypad.h> |
35 | #include <plat/common.h> | 36 | #include <plat/common.h> |
36 | #include <plat/board.h> | 37 | #include <plat/board.h> |
@@ -117,9 +118,9 @@ static struct mtd_partition nor_partitions[] = { | |||
117 | }, | 118 | }, |
118 | }; | 119 | }; |
119 | 120 | ||
120 | static struct flash_platform_data nor_data = { | 121 | static struct physmap_flash_data nor_data = { |
121 | .map_name = "cfi_probe", | ||
122 | .width = 2, | 122 | .width = 2, |
123 | .set_vpp = omap1_set_vpp, | ||
123 | .parts = nor_partitions, | 124 | .parts = nor_partitions, |
124 | .nr_parts = ARRAY_SIZE(nor_partitions), | 125 | .nr_parts = ARRAY_SIZE(nor_partitions), |
125 | }; | 126 | }; |
@@ -131,7 +132,7 @@ static struct resource nor_resource = { | |||
131 | }; | 132 | }; |
132 | 133 | ||
133 | static struct platform_device nor_device = { | 134 | static struct platform_device nor_device = { |
134 | .name = "omapflash", | 135 | .name = "physmap-flash", |
135 | .id = 0, | 136 | .id = 0, |
136 | .dev = { | 137 | .dev = { |
137 | .platform_data = &nor_data, | 138 | .platform_data = &nor_data, |