diff options
author | John Crispin <blogic@openwrt.org> | 2013-09-17 21:46:10 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-09-17 21:46:10 +0000 |
commit | 718e5fe27e81d84b1e08ac57486433e4267ae74c (patch) | |
tree | bc305784e92a261300f79b3999710bc635e947c3 /target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | |
parent | e032c312184f85253ca93a46f47cfae2f3f64f00 (diff) | |
download | master-187ad058-718e5fe27e81d84b1e08ac57486433e4267ae74c.tar.gz master-187ad058-718e5fe27e81d84b1e08ac57486433e4267ae74c.tar.bz2 master-187ad058-718e5fe27e81d84b1e08ac57486433e4267ae74c.zip |
lantiq: add v3.10 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38031 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch b/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch deleted file mode 100644 index 661a4bf3bc..0000000000 --- a/target/linux/lantiq/patches-3.9/0015-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 861d86dc228cc78ebca1612e4f978bf057cab31d Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Sat, 29 Jun 2013 19:21:22 +0200 -Subject: [PATCH 15/22] MTD: lantiq: handle NO_XIP on cfi0001 flash - ---- - drivers/mtd/maps/lantiq-flash.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/maps/lantiq-flash.c -+++ b/drivers/mtd/maps/lantiq-flash.c -@@ -135,7 +135,11 @@ ltq_mtd_probe(struct platform_device *pd - } - - ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL); -- ltq_mtd->map->phys = ltq_mtd->res->start; -+ if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL)) -+ ltq_mtd->map->phys = NO_XIP; -+ else -+ ltq_mtd->map->phys = ltq_mtd->res->start; -+ ltq_mtd->res->start; - ltq_mtd->map->size = resource_size(ltq_mtd->res); - ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res); - if (IS_ERR(ltq_mtd->map->virt)) { |