xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 06968a5479 ("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>
This commit is contained in:
Ard Biesheuvel
2016-02-25 08:57:52 +01:00
parent 20c5ea4fc1
commit 7769aea2a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/maps/pxa2xx-flash.c
View File

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