diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index af068e3e0fe7..6ad49a2cc1a0 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -21,16 +21,17 @@ | |||
21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
22 | #include <linux/mtd/mtd.h> | 22 | #include <linux/mtd/mtd.h> |
23 | #include <linux/mtd/partitions.h> | 23 | #include <linux/mtd/partitions.h> |
24 | #include <linux/mtd/physmap.h> | ||
24 | #include <linux/leds.h> | 25 | #include <linux/leds.h> |
25 | 26 | ||
26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
27 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
28 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
29 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
30 | #include <asm/mach/flash.h> | ||
31 | 31 | ||
32 | #include <plat/led.h> | 32 | #include <plat/led.h> |
33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
34 | #include <plat/flash.h> | ||
34 | #include <plat/mux.h> | 35 | #include <plat/mux.h> |
35 | #include <plat/usb.h> | 36 | #include <plat/usb.h> |
36 | #include <plat/dma.h> | 37 | #include <plat/dma.h> |
@@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { | |||
104 | } | 105 | } |
105 | }; | 106 | }; |
106 | 107 | ||
107 | static struct flash_platform_data palmtt_flash_data = { | 108 | static struct physmap_flash_data palmtt_flash_data = { |
108 | .map_name = "cfi_probe", | ||
109 | .width = 2, | 109 | .width = 2, |
110 | .set_vpp = omap1_set_vpp, | ||
110 | .parts = palmtt_partitions, | 111 | .parts = palmtt_partitions, |
111 | .nr_parts = ARRAY_SIZE(palmtt_partitions), | 112 | .nr_parts = ARRAY_SIZE(palmtt_partitions), |
112 | }; | 113 | }; |
@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { | |||
118 | }; | 119 | }; |
119 | 120 | ||
120 | static struct platform_device palmtt_flash_device = { | 121 | static struct platform_device palmtt_flash_device = { |
121 | .name = "omapflash", | 122 | .name = "physmap-flash", |
122 | .id = 0, | 123 | .id = 0, |
123 | .dev = { | 124 | .dev = { |
124 | .platform_data = &palmtt_flash_data, | 125 | .platform_data = &palmtt_flash_data, |