lantiq: Fix flash for targets with NO_XIP
authorJohn Crispin <john@openwrt.org>
Sat, 14 Feb 2015 20:48:26 +0000 (20:48 +0000)
committerJohn Crispin <john@openwrt.org>
Sat, 14 Feb 2015 20:48:26 +0000 (20:48 +0000)
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

target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
target/linux/lantiq/patches-3.18/0160-owrt-lantiq-multiple-flash.patch

index ac644ab..1848247 100644 (file)
@@ -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);
index de0076a..f276d7b 100644 (file)
 +              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);