Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / arch / arm / mach-vexpress / v2m.c

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 9d9d4af..285edcd 100644 (file)
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -13,11 +13,11 @@
 #include <linux/sysdev.h>
 #include <linux/usb/isp1760.h>
 #include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/mach-types.h>
 #include <asm/sizes.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <asm/hardware/arm_timer.h>
@@ -207,27 +207,13 @@ static struct platform_device v2m_usb_device = {
        .dev.platform_data = &v2m_usb_config,
 };
 
-static int v2m_flash_init(void)
-{
-       writel(0, MMIO_P2V(V2M_SYS_FLASH));
-       return 0;
-}
-
-static void v2m_flash_exit(void)
-{
-       writel(0, MMIO_P2V(V2M_SYS_FLASH));
-}
-
-static void v2m_flash_set_vpp(int on)
+static void v2m_flash_set_vpp(struct platform_device *pdev, int on)
 {
        writel(on != 0, MMIO_P2V(V2M_SYS_FLASH));
 }
 
-static struct flash_platform_data v2m_flash_data = {
-       .map_name       = "cfi_probe",
+static struct physmap_flash_data v2m_flash_data = {
        .width          = 4,
-       .init           = v2m_flash_init,
-       .exit           = v2m_flash_exit,
        .set_vpp        = v2m_flash_set_vpp,
 };
 
@@ -244,7 +230,7 @@ static struct resource v2m_flash_resources[] = {
 };
 
 static struct platform_device v2m_flash_device = {
-       .name           = "armflash",
+       .name           = "physmap-flash",
        .id             = -1,
        .resource       = v2m_flash_resources,
        .num_resources  = ARRAY_SIZE(v2m_flash_resources),