diff options
author | John Crispin <john@openwrt.org> | 2013-03-14 18:42:29 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2013-03-14 18:42:29 +0000 |
commit | b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc (patch) | |
tree | 942791530060eeebfd3e6cd68158c74b892ed7ec /target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | |
parent | 3ab75692f3a7490146eaec4a5a76dec327f11f97 (diff) | |
download | master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.tar.gz master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.tar.bz2 master-31e0f0ae-b98ae2b149e8eef38d3285d8e1b21af32ac1f2dc.zip |
bump to v3.8
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36014
Diffstat (limited to 'target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch b/target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch new file mode 100644 index 0000000000..1732ed934b --- /dev/null +++ b/target/linux/lantiq/patches-3.8/0034-MTD-lantiq-handle-NO_XIP-on-cfi0001-flash.patch @@ -0,0 +1,29 @@ +From 88bc909507f7e9347a24e38185a11a38e51cc773 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Wed, 13 Mar 2013 10:04:34 +0100 +Subject: [PATCH 34/40] MTD: lantiq: handle NO_XIP on cfi0001 flash + +--- + 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 3c3c791..343cfaa 100644 +--- a/drivers/mtd/maps/lantiq-flash.c ++++ b/drivers/mtd/maps/lantiq-flash.c +@@ -134,7 +134,11 @@ ltq_mtd_probe(struct platform_device *pdev) + } + + 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_request_and_ioremap(&pdev->dev, ltq_mtd->res); + if (!ltq_mtd->map->virt) { +-- +1.7.10.4 + |