aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-2430sdp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 1a619787bd80..18497b7a8278 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -18,6 +18,7 @@
18#include <linux/platform_device.h> 18#include <linux/platform_device.h>
19#include <linux/mtd/mtd.h> 19#include <linux/mtd/mtd.h>
20#include <linux/mtd/partitions.h> 20#include <linux/mtd/partitions.h>
21#include <linux/mtd/physmap.h>
21#include <linux/delay.h> 22#include <linux/delay.h>
22#include <linux/i2c/twl.h> 23#include <linux/i2c/twl.h>
23#include <linux/err.h> 24#include <linux/err.h>
@@ -28,7 +29,6 @@
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/map.h> 31#include <asm/mach/map.h>
31#include <asm/mach/flash.h>
32 32
33#include <mach/gpio.h> 33#include <mach/gpio.h>
34#include <plat/mux.h> 34#include <plat/mux.h>
@@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = {
74 } 74 }
75}; 75};
76 76
77static struct flash_platform_data sdp2430_flash_data = { 77static struct physmap_flash_data sdp2430_flash_data = {
78 .map_name = "cfi_probe",
79 .width = 2, 78 .width = 2,
80 .parts = sdp2430_partitions, 79 .parts = sdp2430_partitions,
81 .nr_parts = ARRAY_SIZE(sdp2430_partitions), 80 .nr_parts = ARRAY_SIZE(sdp2430_partitions),
@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = {
88}; 87};
89 88
90static struct platform_device sdp2430_flash_device = { 89static struct platform_device sdp2430_flash_device = {
91 .name = "omapflash", 90 .name = "physmap-flash",
92 .id = 0, 91 .id = 0,
93 .dev = { 92 .dev = {
94 .platform_data = &sdp2430_flash_data, 93 .platform_data = &sdp2430_flash_data,