1 --- a/drivers/mtd/maps/lantiq-flash.c
2 +++ b/drivers/mtd/maps/lantiq-flash.c
4 #include <linux/mtd/cfi.h>
5 #include <linux/platform_device.h>
6 #include <linux/mtd/physmap.h>
7 +#include <linux/mtd/concat.h>
10 #include <lantiq_soc.h>
11 @@ -38,13 +39,16 @@ enum {
15 +#define MAX_RESOURCES 4
18 - struct resource *res;
19 - struct mtd_info *mtd;
20 - struct map_info *map;
21 + struct mtd_info *mtd[MAX_RESOURCES];
22 + struct mtd_info *cmtd;
23 + struct map_info map[MAX_RESOURCES];
26 static const char ltq_map_name[] = "ltq_nor";
27 +static const char * const ltq_probe_types[] = { "cmdlinepart", "ofpart", NULL };
30 ltq_read16(struct map_info *map, unsigned long adr)
31 @@ -108,11 +112,43 @@ ltq_copy_to(struct map_info *map, unsign
35 +ltq_mtd_remove(struct platform_device *pdev)
37 + struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
40 + if (ltq_mtd == NULL)
43 + if (ltq_mtd->cmtd) {
44 + mtd_device_unregister(ltq_mtd->cmtd);
45 + if (ltq_mtd->cmtd != ltq_mtd->mtd[0])
46 + mtd_concat_destroy(ltq_mtd->cmtd);
49 + for (i = 0; i < MAX_RESOURCES; i++) {
50 + if (ltq_mtd->mtd[i] != NULL)
51 + map_destroy(ltq_mtd->mtd[i]);
60 ltq_mtd_probe(struct platform_device *pdev)
62 struct ltq_mtd *ltq_mtd;
63 struct cfi_private *cfi;
67 + int devices_found = 0;
69 + static const char *rom_probe_types[] = {
70 + "cfi_probe", "jedec_probe", NULL
74 ltq_mtd = devm_kzalloc(&pdev->dev, sizeof(struct ltq_mtd), GFP_KERNEL);
76 @@ -120,75 +156,89 @@ ltq_mtd_probe(struct platform_device *pd
78 platform_set_drvdata(pdev, ltq_mtd);
80 - ltq_mtd->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
81 - if (!ltq_mtd->res) {
82 - dev_err(&pdev->dev, "failed to get memory resource\n");
84 + for (i = 0; i < pdev->num_resources; i++) {
85 + printk(KERN_NOTICE "lantiq nor flash device: %.8llx at %.8llx\n",
86 + (unsigned long long)resource_size(&pdev->resource[i]),
87 + (unsigned long long)pdev->resource[i].start);
89 + if (!devm_request_mem_region(&pdev->dev,
90 + pdev->resource[i].start,
91 + resource_size(&pdev->resource[i]),
92 + dev_name(&pdev->dev))) {
93 + dev_err(&pdev->dev, "Could not reserve memory region\n");
97 + ltq_mtd->map[i].name = ltq_map_name;
98 + ltq_mtd->map[i].bankwidth = 2;
99 + ltq_mtd->map[i].read = ltq_read16;
100 + ltq_mtd->map[i].write = ltq_write16;
101 + ltq_mtd->map[i].copy_from = ltq_copy_from;
102 + ltq_mtd->map[i].copy_to = ltq_copy_to;
104 + if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
105 + ltq_mtd->map[i].phys = NO_XIP;
107 + ltq_mtd->map[i].phys = pdev->resource[i].start;
108 + ltq_mtd->map[i].size = resource_size(&pdev->resource[i]);
109 + ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, pdev->resource[i].start,
110 + ltq_mtd->map[i].size);
111 + if (IS_ERR(ltq_mtd->map[i].virt))
112 + return PTR_ERR(ltq_mtd->map[i].virt);
114 + if (ltq_mtd->map[i].virt == NULL) {
115 + dev_err(&pdev->dev, "Failed to ioremap flash region\n");
116 + err = PTR_ERR(ltq_mtd->map[i].virt);
120 + ltq_mtd->map[i].map_priv_1 = LTQ_NOR_PROBING;
121 + for (type = rom_probe_types; !ltq_mtd->mtd[i] && *type; type++)
122 + ltq_mtd->mtd[i] = do_map_probe(*type, <q_mtd->map[i]);
123 + ltq_mtd->map[i].map_priv_1 = LTQ_NOR_NORMAL;
125 + if (!ltq_mtd->mtd[i]) {
126 + dev_err(&pdev->dev, "probing failed\n");
132 + ltq_mtd->mtd[i]->owner = THIS_MODULE;
133 + ltq_mtd->mtd[i]->dev.parent = &pdev->dev;
135 + cfi = ltq_mtd->map[i].fldrv_priv;
136 + cfi->addr_unlock1 ^= 1;
137 + cfi->addr_unlock2 ^= 1;
140 - ltq_mtd->map = devm_kzalloc(&pdev->dev, sizeof(struct map_info),
145 - if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
146 - ltq_mtd->map->phys = NO_XIP;
148 - ltq_mtd->map->phys = ltq_mtd->res->start;
149 - ltq_mtd->res->start;
150 - ltq_mtd->map->size = resource_size(ltq_mtd->res);
151 - ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
152 - if (IS_ERR(ltq_mtd->map->virt))
153 - return PTR_ERR(ltq_mtd->map->virt);
155 - ltq_mtd->map->name = ltq_map_name;
156 - ltq_mtd->map->bankwidth = 2;
157 - ltq_mtd->map->read = ltq_read16;
158 - ltq_mtd->map->write = ltq_write16;
159 - ltq_mtd->map->copy_from = ltq_copy_from;
160 - ltq_mtd->map->copy_to = ltq_copy_to;
162 - ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING;
163 - ltq_mtd->mtd = do_map_probe("cfi_probe", ltq_mtd->map);
164 - ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL;
166 - if (!ltq_mtd->mtd) {
167 - dev_err(&pdev->dev, "probing failed\n");
169 + if (devices_found == 1) {
170 + ltq_mtd->cmtd = ltq_mtd->mtd[0];
171 + } else if (devices_found > 1) {
173 + * We detected multiple devices. Concatenate them together.
175 + ltq_mtd->cmtd = mtd_concat_create(ltq_mtd->mtd, devices_found, dev_name(&pdev->dev));
176 + if (ltq_mtd->cmtd == NULL)
180 - ltq_mtd->mtd->dev.parent = &pdev->dev;
181 - mtd_set_of_node(ltq_mtd->mtd, pdev->dev.of_node);
183 - cfi = ltq_mtd->map->fldrv_priv;
184 - cfi->addr_unlock1 ^= 1;
185 - cfi->addr_unlock2 ^= 1;
186 + ltq_mtd->cmtd->dev.parent = &pdev->dev;
187 + mtd_set_of_node(ltq_mtd->cmtd, pdev->dev.of_node);
189 - err = mtd_device_register(ltq_mtd->mtd, NULL, 0);
190 + err = mtd_device_register(ltq_mtd->cmtd, NULL, 0);
192 dev_err(&pdev->dev, "failed to add partitions\n");
200 - map_destroy(ltq_mtd->mtd);
202 + ltq_mtd_remove(pdev);
207 -ltq_mtd_remove(struct platform_device *pdev)
209 - struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
211 - if (ltq_mtd && ltq_mtd->mtd) {
212 - mtd_device_unregister(ltq_mtd->mtd);
213 - map_destroy(ltq_mtd->mtd);
218 static const struct of_device_id ltq_mtd_match[] = {
219 { .compatible = "lantiq,nor" },