diff options
| author | John Crispin <john@openwrt.org> | 2014-09-11 17:49:57 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-09-11 17:49:57 +0000 |
| commit | 18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1 (patch) | |
| tree | 9055eb556a99fb07f30d3217fe2fdd60b51ca72c /target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | |
| parent | 5920eac8eeba0d689c7af9389aea2e2f46eec9ce (diff) | |
| download | upstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.tar.gz upstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.tar.bz2 upstream-18b5d72d834b1a4fb3c7daa2fab9f449ff55b1c1.zip | |
lantiq: update 3.14 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 42476
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch b/target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch new file mode 100644 index 0000000000..4a2317030c --- /dev/null +++ b/target/linux/lantiq/patches-3.14/0020-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch @@ -0,0 +1,30 @@ +From e3b20f04e9f9cae1babe091fdc1d08d7703ae344 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Thu, 7 Aug 2014 18:18:00 +0200 +Subject: [PATCH 20/36] MTD: lantiq: handle NO_XIP on cfi0001 flash + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + drivers/mtd/maps/lantiq-flash.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c +index 93c507a..710d699 100644 +--- a/drivers/mtd/maps/lantiq-flash.c ++++ b/drivers/mtd/maps/lantiq-flash.c +@@ -140,7 +140,11 @@ ltq_mtd_probe(struct platform_device *pdev) + if (!ltq_mtd->map) + return -ENOMEM; + +- 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)) +-- +1.7.10.4 + |