[ARM] 4554/1: replace consistent_sync() with flush_ioremap_region()

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / mainstone-flash.c

diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c
index 87e93fa60588aa29384705ba8e904fc2df1c3b88..d76487d82dcdc4259d14554692a5e7e4f0c4ada2 100644 (file)
--- a/drivers/mtd/maps/mainstone-flash.c
+++ b/drivers/mtd/maps/mainstone-flash.c
@@ -5,7 +5,7 @@
  *
  * Author:     Nicolas Pitre
  * Copyright:  (C) 2001 MontaVista Software Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -15,14 +15,16 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/dma-mapping.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mainstone.h>
+#include <asm/cacheflush.h>
 
 
 #define ROM_ADDR       0x00000000
@@ -33,7 +35,7 @@
 static void mainstone_map_inval_cache(struct map_info *map, unsigned long from,
                                      ssize_t len)
 {
-       consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
+       flush_ioremap_region(map->phys, map->cached, from, len);
 }
 
 static struct map_info mainstone_maps[2] = { {
@@ -88,27 +90,27 @@ static int __init init_mainstone(void)
                mainstone_maps[i].virt = ioremap(mainstone_maps[i].phys,
                                                 WINDOW_SIZE);
                if (!mainstone_maps[i].virt) {
-                       printk(KERN_WARNING "Failed to ioremap %s\n", 
+                       printk(KERN_WARNING "Failed to ioremap %s\n",
                               mainstone_maps[i].name);
                        if (!ret)
                                ret = -ENOMEM;
                        continue;
                }
-               mainstone_maps[i].cached = 
+               mainstone_maps[i].cached =
                        ioremap_cached(mainstone_maps[i].phys, WINDOW_SIZE);
                if (!mainstone_maps[i].cached)
                        printk(KERN_WARNING "Failed to ioremap cached %s\n",
                               mainstone_maps[i].name);
                simple_map_init(&mainstone_maps[i]);
 
-               printk(KERN_NOTICE 
+               printk(KERN_NOTICE
                       "Probing %s at physical address 0x%08lx"
                       " (%d-bit bankwidth)\n",
-                      mainstone_maps[i].name, mainstone_maps[i].phys, 
+                      mainstone_maps[i].name, mainstone_maps[i].phys,
                       mainstone_maps[i].bankwidth * 8);
 
                mymtds[i] = do_map_probe("cfi_probe", &mainstone_maps[i]);
-               
+
                if (!mymtds[i]) {
                        iounmap((void *)mainstone_maps[i].virt);
                        if (mainstone_maps[i].cached)
@@ -128,21 +130,21 @@ static int __init init_mainstone(void)
 
        if (!mymtds[0] && !mymtds[1])
                return ret;
-       
+
        for (i = 0; i < 2; i++) {
                if (!mymtds[i]) {
-                       printk(KERN_WARNING "%s is absent. Skipping\n", 
+                       printk(KERN_WARNING "%s is absent. Skipping\n",
                               mainstone_maps[i].name);
                } else if (nr_parsed_parts[i]) {
-                       add_mtd_partitions(mymtds[i], parsed_parts[i], 
+                       add_mtd_partitions(mymtds[i], parsed_parts[i],
                                           nr_parsed_parts[i]);
                } else if (!i) {
                        printk("Using static partitions on %s\n",
                               mainstone_maps[i].name);
-                       add_mtd_partitions(mymtds[i], mainstone_partitions, 
+                       add_mtd_partitions(mymtds[i], mainstone_partitions,
                                           ARRAY_SIZE(mainstone_partitions));
                } else {
-                       printk("Registering %s as whole device\n", 
+                       printk("Registering %s as whole device\n",
                               mainstone_maps[i].name);
                        add_mtd_device(mymtds[i]);
                }