Commit 7769aea2 authored Feb 25, 2016 by Ard Biesheuvel

mtd: pxa2xx-flash: switch back from memremap to ioremap_cached

This reverts commit 06968a54 ("mtd: pxa2xx-flash: switch from
ioremap_cache to memremap"), since NOR with memory semantics in array mode
and RAM are not necessarily the same thing, and architectures may implement
ioremap_cached() and memremap() with different memory attributes.

For this reason, ioremap_cached() has been brought back from the dead on
the ARM side, so switch this driver back to using it instead of memremap().

Cc: David Woodhouse <dwmw2@infradead.org>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

parent 20c5ea4f

drivers/mtd/maps/pxa2xx-flash.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -71,8 +71,8 @@ static int pxa2xx_flash_probe(struct platform_device *pdev)
		info->map.name);
		return -ENOMEM;
		}
		info->map.cached = memremap(info->map.phys, info->map.size,
		MEMREMAP_WB);
		info->map.cached =
		ioremap_cached(info->map.phys, info->map.size);
		if (!info->map.cached)
		printk(KERN_WARNING "Failed to ioremap cached %s\n",
		info->map.name);
		@@ -111,7 +111,7 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
		map_destroy(info->mtd);
		iounmap(info->map.virt);
		if (info->map.cached)
		memunmap(info->map.cached);
		iounmap(info->map.cached);
		kfree(info);
		return 0;
		}