diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmte.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 9fe887262bdf..569b4c9085cd 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
26 | #include <linux/mtd/physmap.h> | ||
26 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
27 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
28 | #include <linux/apm-emulation.h> | 29 | #include <linux/apm-emulation.h> |
@@ -31,9 +32,9 @@ | |||
31 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
33 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
34 | #include <asm/mach/flash.h> | ||
35 | 35 | ||
36 | #include <mach/gpio.h> | 36 | #include <mach/gpio.h> |
37 | #include <plat/flash.h> | ||
37 | #include <plat/mux.h> | 38 | #include <plat/mux.h> |
38 | #include <plat/usb.h> | 39 | #include <plat/usb.h> |
39 | #include <plat/tc.h> | 40 | #include <plat/tc.h> |
@@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { | |||
126 | }, | 127 | }, |
127 | }; | 128 | }; |
128 | 129 | ||
129 | static struct flash_platform_data palmte_rom_data = { | 130 | static struct physmap_flash_data palmte_rom_data = { |
130 | .map_name = "map_rom", | ||
131 | .width = 2, | 131 | .width = 2, |
132 | .set_vpp = omap1_set_vpp, | ||
132 | .parts = palmte_rom_partitions, | 133 | .parts = palmte_rom_partitions, |
133 | .nr_parts = ARRAY_SIZE(palmte_rom_partitions), | 134 | .nr_parts = ARRAY_SIZE(palmte_rom_partitions), |
134 | }; | 135 | }; |
@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { | |||
140 | }; | 141 | }; |
141 | 142 | ||
142 | static struct platform_device palmte_rom_device = { | 143 | static struct platform_device palmte_rom_device = { |
143 | .name = "omapflash", | 144 | .name = "physmap-flash", |
144 | .id = -1, | 145 | .id = -1, |
145 | .dev = { | 146 | .dev = { |
146 | .platform_data = &palmte_rom_data, | 147 | .platform_data = &palmte_rom_data, |