diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index c7a3b6f36500..6641de9257ef 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -25,14 +25,15 @@ | |||
25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
28 | #include <linux/mtd/physmap.h> | ||
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
30 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
33 | #include <asm/mach/flash.h> | ||
34 | 34 | ||
35 | #include <mach/gpio.h> | 35 | #include <mach/gpio.h> |
36 | #include <plat/flash.h> | ||
36 | #include <plat/mux.h> | 37 | #include <plat/mux.h> |
37 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
38 | #include <plat/dma.h> | 39 | #include <plat/dma.h> |
@@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { | |||
126 | }, | 127 | }, |
127 | }; | 128 | }; |
128 | 129 | ||
129 | static struct flash_platform_data palmz71_rom_data = { | 130 | static struct physmap_flash_data palmz71_rom_data = { |
130 | .map_name = "map_rom", | ||
131 | .name = "onboardrom", | ||
132 | .width = 2, | 131 | .width = 2, |
132 | .set_vpp = omap1_set_vpp, | ||
133 | .parts = palmz71_rom_partitions, | 133 | .parts = palmz71_rom_partitions, |
134 | .nr_parts = ARRAY_SIZE(palmz71_rom_partitions), | 134 | .nr_parts = ARRAY_SIZE(palmz71_rom_partitions), |
135 | }; | 135 | }; |
@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { | |||
141 | }; | 141 | }; |
142 | 142 | ||
143 | static struct platform_device palmz71_rom_device = { | 143 | static struct platform_device palmz71_rom_device = { |
144 | .name = "omapflash", | 144 | .name = "physmap-flash", |
145 | .id = -1, | 145 | .id = -1, |
146 | .dev = { | 146 | .dev = { |
147 | .platform_data = &palmz71_rom_data, | 147 | .platform_data = &palmz71_rom_data, |