From 6c476b89f3d685b41f2e216698fc8c90ddb11dfd Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 7 Aug 2014 18:18:00 +0200 Subject: [PATCH 12/31] MTD: lantiq: handle NO_XIP on cfi0001 flash Signed-off-by: John Crispin --- 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