From: John Crispin <john@openwrt.org>
Date: Sat, 14 Feb 2015 20:48:26 +0000 (+0000)
Subject: lantiq: Fix flash for targets with NO_XIP
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a15dd8ec78ca8acbec00f5535538961f0ec23f71;p=librecmc%2Flibrecmc.git

lantiq: Fix flash for targets with NO_XIP

For targets with NO_XIP ltq_mtd->map[i].phys equals -1 and devm_ioremap fails.
Fix this by using pdev->resource[i].start instead.

Signed-off-by: Matti Laakso <malaakso@elisanet.fi>

SVN-Revision: 44450
---

diff --git a/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch b/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
index ac644abb51..184824716d 100644
--- a/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
+++ b/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
@@ -98,7 +98,7 @@
 +		else
 +			ltq_mtd->map[i].phys = pdev->resource[i].start;
 +		ltq_mtd->map[i].size = resource_size(&pdev->resource[i]);
-+		ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, ltq_mtd->map[i].phys,
++		ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, pdev->resource[i].start,
 +						 ltq_mtd->map[i].size);
 +		if (IS_ERR(ltq_mtd->map[i].virt))
 +			return PTR_ERR(ltq_mtd->map[i].virt);
diff --git a/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch b/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
index de0076a433..f276d7bfc0 100644
--- a/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
+++ b/target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch
@@ -103,7 +103,7 @@
 +		else
 +			ltq_mtd->map[i].phys = pdev->resource[i].start;
 +		ltq_mtd->map[i].size = resource_size(&pdev->resource[i]);
-+		ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, ltq_mtd->map[i].phys,
++		ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, pdev->resource[i].start,
 +						 ltq_mtd->map[i].size);
 +		if (IS_ERR(ltq_mtd->map[i].virt))
 +			return PTR_ERR(ltq_mtd->map[i].virt);