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>
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";
31 +ltq_mtd_remove(struct platform_device *pdev)
33 + struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
36 + if (ltq_mtd == NULL)
39 + if (ltq_mtd->cmtd) {
40 + mtd_device_unregister(ltq_mtd->cmtd);
41 + if (ltq_mtd->cmtd != ltq_mtd->mtd[0])
42 + mtd_concat_destroy(ltq_mtd->cmtd);
45 + for (i = 0; i < MAX_RESOURCES; i++) {
46 + if (ltq_mtd->mtd[i] != NULL)
47 + map_destroy(ltq_mtd->mtd[i]);
56 ltq_mtd_probe(struct platform_device *pdev)
58 struct mtd_part_parser_data ppdata;
59 struct ltq_mtd *ltq_mtd;
60 struct cfi_private *cfi;
64 + int devices_found = 0;
66 + static const char *rom_probe_types[] = {
67 + "cfi_probe", "jedec_probe", NULL
71 if (of_machine_is_compatible("lantiq,falcon") &&
72 (ltq_boot_select() != BS_FLASH)) {
75 platform_set_drvdata(pdev, ltq_mtd);
77 - ltq_mtd->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
78 - if (!ltq_mtd->res) {
79 - dev_err(&pdev->dev, "failed to get memory resource\n");
81 + for (i = 0; i < pdev->num_resources; i++) {
82 + printk(KERN_NOTICE "lantiq nor flash device: %.8llx at %.8llx\n",
83 + (unsigned long long)resource_size(&pdev->resource[i]),
84 + (unsigned long long)pdev->resource[i].start);
86 + if (!devm_request_mem_region(&pdev->dev,
87 + pdev->resource[i].start,
88 + resource_size(&pdev->resource[i]),
89 + dev_name(&pdev->dev))) {
90 + dev_err(&pdev->dev, "Could not reserve memory region\n");
94 + ltq_mtd->map[i].name = ltq_map_name;
95 + ltq_mtd->map[i].bankwidth = 2;
96 + ltq_mtd->map[i].read = ltq_read16;
97 + ltq_mtd->map[i].write = ltq_write16;
98 + ltq_mtd->map[i].copy_from = ltq_copy_from;
99 + ltq_mtd->map[i].copy_to = ltq_copy_to;
101 + if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
102 + ltq_mtd->map[i].phys = NO_XIP;
104 + ltq_mtd->map[i].phys = pdev->resource[i].start;
105 + ltq_mtd->map[i].size = resource_size(&pdev->resource[i]);
106 + ltq_mtd->map[i].virt = devm_ioremap(&pdev->dev, ltq_mtd->map[i].phys,
107 + ltq_mtd->map[i].size);
108 + if (IS_ERR(ltq_mtd->map[i].virt))
109 + return PTR_ERR(ltq_mtd->map[i].virt);
111 + if (ltq_mtd->map[i].virt == NULL) {
112 + dev_err(&pdev->dev, "Failed to ioremap flash region\n");
113 + err = PTR_ERR(ltq_mtd->map[i].virt);
117 + ltq_mtd->map[i].map_priv_1 = LTQ_NOR_PROBING;
118 + for (type = rom_probe_types; !ltq_mtd->mtd[i] && *type; type++)
119 + ltq_mtd->mtd[i] = do_map_probe(*type, <q_mtd->map[i]);
120 + ltq_mtd->map[i].map_priv_1 = LTQ_NOR_NORMAL;
122 + if (!ltq_mtd->mtd[i]) {
123 + dev_err(&pdev->dev, "probing failed\n");
129 + ltq_mtd->mtd[i]->owner = THIS_MODULE;
130 + ltq_mtd->mtd[i]->dev.parent = &pdev->dev;
132 + cfi = ltq_mtd->map[i].fldrv_priv;
133 + cfi->addr_unlock1 ^= 1;
134 + cfi->addr_unlock2 ^= 1;
137 - ltq_mtd->map = devm_kzalloc(&pdev->dev, sizeof(struct map_info),
142 - if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
143 - ltq_mtd->map->phys = NO_XIP;
145 - ltq_mtd->map->phys = ltq_mtd->res->start;
146 - ltq_mtd->res->start;
147 - ltq_mtd->map->size = resource_size(ltq_mtd->res);
148 - ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
149 - if (IS_ERR(ltq_mtd->map->virt))
150 - return PTR_ERR(ltq_mtd->map->virt);
152 - ltq_mtd->map->name = ltq_map_name;
153 - ltq_mtd->map->bankwidth = 2;
154 - ltq_mtd->map->read = ltq_read16;
155 - ltq_mtd->map->write = ltq_write16;
156 - ltq_mtd->map->copy_from = ltq_copy_from;
157 - ltq_mtd->map->copy_to = ltq_copy_to;
159 - ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING;
160 - ltq_mtd->mtd = do_map_probe("cfi_probe", ltq_mtd->map);
161 - ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL;
163 - if (!ltq_mtd->mtd) {
164 - dev_err(&pdev->dev, "probing failed\n");
168 - ltq_mtd->mtd->owner = THIS_MODULE;
170 - cfi = ltq_mtd->map->fldrv_priv;
171 - cfi->addr_unlock1 ^= 1;
172 - cfi->addr_unlock2 ^= 1;
173 + if (devices_found == 1) {
174 + ltq_mtd->cmtd = ltq_mtd->mtd[0];
175 + } else if (devices_found > 1) {
177 + * We detected multiple devices. Concatenate them together.
179 + ltq_mtd->cmtd = mtd_concat_create(ltq_mtd->mtd, devices_found, dev_name(&pdev->dev));
180 + if (ltq_mtd->cmtd == NULL)
184 ppdata.of_node = pdev->dev.of_node;
185 - err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types,
186 + err = mtd_device_parse_register(ltq_mtd->cmtd, ltq_probe_types,
189 dev_err(&pdev->dev, "failed to add partitions\n");
197 - map_destroy(ltq_mtd->mtd);
199 + ltq_mtd_remove(pdev);
204 -ltq_mtd_remove(struct platform_device *pdev)
206 - struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
208 - if (ltq_mtd && ltq_mtd->mtd) {
209 - mtd_device_unregister(ltq_mtd->mtd);
210 - map_destroy(ltq_mtd->mtd);
215 static const struct of_device_id ltq_mtd_match[] = {
216 { .compatible = "lantiq,nor" },