aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-voiceblue.c
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2010-02-15 13:03:32 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 13:03:32 -0500
commit561b036ad9d0b4f0cd311d2e38025919c2cb437f (patch)
tree15c141467fe33e879a539b418e3131dd6d0910b1 /arch/arm/mach-omap1/board-voiceblue.c
parentfd17a25fe9423bbde16a326466330ad486321dfc (diff)
omap: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree Cc: linux-mtd@lists.infradead.org Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-voiceblue.c')
-rw-r--r--arch/arm/mach-omap1/board-voiceblue.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 169183537997..87b9436fe7c0 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -18,6 +18,7 @@
18#include <linux/irq.h> 18#include <linux/irq.h>
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/kernel.h> 20#include <linux/kernel.h>
21#include <linux/mtd/physmap.h>
21#include <linux/notifier.h> 22#include <linux/notifier.h>
22#include <linux/reboot.h> 23#include <linux/reboot.h>
23#include <linux/serial_8250.h> 24#include <linux/serial_8250.h>
@@ -27,11 +28,11 @@
27#include <mach/hardware.h> 28#include <mach/hardware.h>
28#include <asm/mach-types.h> 29#include <asm/mach-types.h>
29#include <asm/mach/arch.h> 30#include <asm/mach/arch.h>
30#include <asm/mach/flash.h>
31#include <asm/mach/map.h> 31#include <asm/mach/map.h>
32 32
33#include <plat/common.h> 33#include <plat/common.h>
34#include <mach/gpio.h> 34#include <mach/gpio.h>
35#include <plat/flash.h>
35#include <plat/mux.h> 36#include <plat/mux.h>
36#include <plat/tc.h> 37#include <plat/tc.h>
37#include <plat/usb.h> 38#include <plat/usb.h>
@@ -86,9 +87,9 @@ static int __init ext_uart_init(void)
86} 87}
87arch_initcall(ext_uart_init); 88arch_initcall(ext_uart_init);
88 89
89static struct flash_platform_data voiceblue_flash_data = { 90static struct physmap_flash_data voiceblue_flash_data = {
90 .map_name = "cfi_probe",
91 .width = 2, 91 .width = 2,
92 .set_vpp = omap1_set_vpp,
92}; 93};
93 94
94static struct resource voiceblue_flash_resource = { 95static struct resource voiceblue_flash_resource = {
@@ -98,7 +99,7 @@ static struct resource voiceblue_flash_resource = {
98}; 99};
99 100
100static struct platform_device voiceblue_flash_device = { 101static struct platform_device voiceblue_flash_device = {
101 .name = "omapflash", 102 .name = "physmap-flash",
102 .id = 0, 103 .id = 0,
103 .dev = { 104 .dev = {
104 .platform_data = &voiceblue_flash_data, 105 .platform_data = &voiceblue_flash_data,