0d9f760f27
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
25 lines
900 B
Diff
25 lines
900 B
Diff
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)) {
|