lantiq: add v3.10 patches
[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.10 / 0014-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch
1 From 2be714d9730da5723de68b4f9bfd5941ccd5bc4c Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sat, 29 Jun 2013 19:21:22 +0200
4 Subject: [PATCH 14/34] MTD: lantiq: handle NO_XIP on cfi0001 flash
5
6 ---
7 drivers/mtd/maps/lantiq-flash.c | 6 +++++-
8 1 file changed, 5 insertions(+), 1 deletion(-)
9
10 diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
11 index d7ac65d..95b155a 100644
12 --- a/drivers/mtd/maps/lantiq-flash.c
13 +++ b/drivers/mtd/maps/lantiq-flash.c
14 @@ -134,7 +134,11 @@ ltq_mtd_probe(struct platform_device *pdev)
15 }
16
17 ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
18 - ltq_mtd->map->phys = ltq_mtd->res->start;
19 + if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
20 + ltq_mtd->map->phys = NO_XIP;
21 + else
22 + ltq_mtd->map->phys = ltq_mtd->res->start;
23 + ltq_mtd->res->start;
24 ltq_mtd->map->size = resource_size(ltq_mtd->res);
25 ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
26 if (IS_ERR(ltq_mtd->map->virt)) {
27 --
28 1.7.10.4
29