556e8cb85803aadc6da1fc34df27249aa4b4be2b
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-2.6.32 / 040-bcm963xx_flashmap.patch
1 From e734ace5baa04e0e8af1d4483475fbd6bd2b32a1 Mon Sep 17 00:00:00 2001
2 From: Axel Gembe <ago@bastart.eu.org>
3 Date: Mon, 12 May 2008 18:54:09 +0200
4 Subject: [PATCH] bcm963xx: flashmap support
5
6
7 Signed-off-by: Axel Gembe <ago@bastart.eu.org>
8 ---
9 drivers/mtd/maps/Kconfig | 7 +++++++
10 drivers/mtd/maps/Makefile | 1 +
11 drivers/mtd/redboot.c | 13 ++++++++++---
12 3 files changed, 18 insertions(+), 3 deletions(-)
13
14 --- a/drivers/mtd/maps/Kconfig
15 +++ b/drivers/mtd/maps/Kconfig
16 @@ -259,6 +259,13 @@ config MTD_ALCHEMY
17 help
18 Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
19
20 +config MTD_BCM963XX
21 + tristate "BCM963xx Flash device"
22 + depends on MIPS && BCM63XX
23 + help
24 + Flash memory access on BCM963xx boards. Currently only works with
25 + RedBoot and CFE.
26 +
27 config MTD_DILNETPC
28 tristate "CFI Flash device mapped on DIL/Net PC"
29 depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
30 --- a/drivers/mtd/redboot.c
31 +++ b/drivers/mtd/redboot.c
32 @@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
33 return 1;
34 }
35
36 -static int parse_redboot_partitions(struct mtd_info *master,
37 +int parse_redboot_partitions(struct mtd_info *master,
38 struct mtd_partition **pparts,
39 unsigned long fis_origin)
40 {
41 @@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru
42 goto out;
43 }
44
45 + if (!fis_origin) {
46 + for (i = 0; i < numslots; i++) {
47 + if (!strncmp(buf[i].name, "RedBoot", 8)) {
48 + fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
49 + }
50 + }
51 + }
52 +
53 for (i = 0; i < numslots; i++) {
54 struct fis_list *new_fl, **prev;
55
56 @@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru
57 new_fl->img = &buf[i];
58 if (fis_origin) {
59 buf[i].flash_base -= fis_origin;
60 - } else {
61 - buf[i].flash_base &= master->size-1;
62 }
63 + buf[i].flash_base &= (master->size << 1) - 1;
64
65 /* I'm sure the JFFS2 code has done me permanent damage.
66 * I now think the following is _normal_
67 --- a/drivers/mtd/maps/Makefile
68 +++ b/drivers/mtd/maps/Makefile
69 @@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-asy
70 obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
71 obj-$(CONFIG_MTD_VMU) += vmu-flash.o
72 obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o
73 +obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
74 --- /dev/null
75 +++ b/drivers/mtd/maps/bcm963xx-flash.c
76 @@ -0,0 +1,399 @@
77 +/*
78 + * Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org>
79 + * Mike Albon <malbon@openwrt.org>
80 + *
81 + * This program is free software; you can redistribute it and/or modify
82 + * it under the terms of the GNU General Public License as published by
83 + * the Free Software Foundation; either version 2 of the License, or
84 + * (at your option) any later version.
85 + *
86 + * This program is distributed in the hope that it will be useful,
87 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
88 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
89 + * GNU General Public License for more details.
90 + *
91 + * You should have received a copy of the GNU General Public License
92 + * along with this program; if not, write to the Free Software
93 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
94 + */
95 +
96 +#include <linux/init.h>
97 +#include <linux/kernel.h>
98 +#include <linux/mtd/map.h>
99 +#include <linux/mtd/mtd.h>
100 +#include <linux/mtd/partitions.h>
101 +#include <linux/vmalloc.h>
102 +#include <linux/platform_device.h>
103 +
104 +#include <bcm_tag.h>
105 +#include <asm/io.h>
106 +
107 +#define BUSWIDTH 2 /* Buswidth */
108 +#define EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
109 +
110 +#define PFX KBUILD_MODNAME ": "
111 +
112 +extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long fis_origin);
113 +static struct mtd_partition *parsed_parts;
114 +
115 +static struct mtd_info *bcm963xx_mtd_info;
116 +
117 +static struct map_info bcm963xx_map = {
118 + .name = "bcm963xx",
119 + .bankwidth = BUSWIDTH,
120 +};
121 +
122 +static struct tagiddesc_t tagidtab[NUM_TAGID] = TAGID_DEFINITIONS;
123 +
124 +static uint32_t tagcrc32tab[256] = {
125 + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
126 + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
127 + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
128 + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
129 + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
130 + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
131 + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
132 + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
133 + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
134 + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
135 + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
136 + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
137 + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
138 + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
139 + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
140 + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
141 + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
142 + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
143 + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
144 + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
145 + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
146 + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
147 + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
148 + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
149 + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
150 + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
151 + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
152 + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
153 + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
154 + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
155 + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
156 + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
157 +};
158 +
159 +static uint32_t tagcrc32(uint32_t crc, uint8_t *data, size_t len)
160 +{
161 + while (len--)
162 + crc = (crc >> 8) ^ tagcrc32tab[(crc ^ *data++) & 0xFF];
163 +
164 + return crc;
165 +}
166 +
167 +static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts)
168 +{
169 + int nrparts = 3, curpart = 0; /* CFE,NVRAM and global LINUX are always present. */
170 + union bcm_tag *buf;
171 + struct mtd_partition *parts;
172 + int ret;
173 + size_t retlen;
174 + unsigned int rootfsaddr, kerneladdr, spareaddr;
175 + unsigned int rootfslen, kernellen, sparelen, totallen;
176 + unsigned char *tagid;
177 + int namelen = 0;
178 + int i;
179 + uint32_t tagidcrc;
180 + uint32_t calctagidcrc;
181 + bool tagid_match = false;
182 + char *boardid;
183 + char *tagversion;
184 + char *matchtagid;
185 +
186 + /* Allocate memory for buffer */
187 + buf = vmalloc(sizeof(union bcm_tag));
188 + if (!buf)
189 + return -ENOMEM;
190 +
191 + /* Get the tag */
192 + ret = master->read(master,master->erasesize,sizeof(union bcm_tag), &retlen, (void *)buf);
193 + if (retlen != sizeof(union bcm_tag)){
194 + vfree(buf);
195 + return -EIO;
196 + }
197 +
198 + /* tagId isn't in the same location, so we check each tagid against the
199 + * tagid CRC. If the CRC is valid we have found the right tag and so
200 + * use that tag
201 + */
202 +
203 + for (i = 0; i < NUM_TAGID; i++) {
204 + switch(i) {
205 + case 0:
206 + matchtagid = "bccfe";
207 + tagid = &(buf->bccfe.tagId[0]);
208 + sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
209 + sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
210 + sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
211 + sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
212 + sscanf(buf->bccfe.totalLength, "%u", &totallen);
213 + tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
214 + tagversion = &(buf->bccfe.tagVersion[0]);
215 + boardid = &(buf->bccfe.boardid[0]);
216 + break;
217 + case 1:
218 + matchtagid = "bc300";
219 + tagid = &(buf->bc300.tagId[0]);
220 + sscanf(buf->bc300.rootAddress,"%u", &rootfsaddr);
221 + sscanf(buf->bc300.rootLength, "%u", &rootfslen);
222 + sscanf(buf->bc300.kernelAddress, "%u", &kerneladdr);
223 + sscanf(buf->bc300.kernelLength, "%u", &kernellen);
224 + sscanf(buf->bc300.totalLength, "%u", &totallen);
225 + tagidcrc = *(uint32_t *)&(buf->bc300.tagIdCRC[0]);
226 + tagversion = &(buf->bc300.tagVersion[0]);
227 + boardid = &(buf->bc300.boardid[0]);
228 + break;
229 + case 2:
230 + matchtagid = "ag306";
231 + tagid = &(buf->ag306.tagId[0]);
232 + sscanf(buf->ag306.rootAddress,"%u", &rootfsaddr);
233 + sscanf(buf->ag306.rootLength, "%u", &rootfslen);
234 + sscanf(buf->ag306.kernelAddress, "%u", &kerneladdr);
235 + sscanf(buf->ag306.kernelLength, "%u", &kernellen);
236 + sscanf(buf->ag306.totalLength, "%u", &totallen);
237 + tagidcrc = *(uint32_t *)&(buf->ag306.tagIdCRC[0]);
238 + tagversion = &(buf->ag306.tagVersion[0]);
239 + boardid = &(buf->ag306.boardid[0]);
240 + break;
241 + case 3:
242 + matchtagid = "bc221";
243 + tagid = &(buf->bc221.tagId[0]);
244 + sscanf(buf->bc221.rootAddress,"%u", &rootfsaddr);
245 + sscanf(buf->bc221.rootLength, "%u", &rootfslen);
246 + sscanf(buf->bc221.kernelAddress, "%u", &kerneladdr);
247 + sscanf(buf->bc221.kernelLength, "%u", &kernellen);
248 + sscanf(buf->bc221.totalLength, "%u", &totallen);
249 + tagidcrc = *(uint32_t *)&(buf->bc221.tagIdCRC[0]);
250 + tagversion = &(buf->bc221.tagVersion[0]);
251 + boardid = &(buf->bc221.boardid[0]);
252 + break;
253 + case 4:
254 + matchtagid = "bc310";
255 + tagid = &(buf->bc310.tagId[0]);
256 + sscanf(buf->bc310.rootAddress,"%u", &rootfsaddr);
257 + sscanf(buf->bc310.rootLength, "%u", &rootfslen);
258 + sscanf(buf->bc310.kernelAddress, "%u", &kerneladdr);
259 + sscanf(buf->bc310.kernelLength, "%u", &kernellen);
260 + sscanf(buf->bc310.totalLength, "%u", &totallen);
261 + tagidcrc = *(uint32_t *)&(buf->bc310.tagIdCRC[0]);
262 + tagversion = &(buf->bc310.tagVersion[0]);
263 + boardid = &(buf->bc310.boardid[0]);
264 + break;
265 + }
266 + if (strncmp(tagid, matchtagid, TAGID_LEN) != 0) {
267 + continue;
268 + }
269 +
270 + calctagidcrc = htonl(tagcrc32(IMAGETAG_CRC_START, tagid, TAGID_LEN));
271 + if (tagidcrc == calctagidcrc) {
272 + tagid_match = true;
273 + break;
274 + }
275 + }
276 +
277 + if (!tagid_match) {
278 + tagid = "bcram";
279 + sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
280 + sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
281 + sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
282 + sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
283 + sscanf(buf->bccfe.totalLength, "%u", &totallen);
284 + tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
285 + tagversion = &(buf->bccfe.tagVersion[0]);
286 + boardid = &(buf->bccfe.boardid[0]);
287 + }
288 +
289 + printk(KERN_INFO PFX "CFE boot tag found with version %s, board type %s, and tagid %s.\n",tagversion,boardid,tagid);
290 +
291 + rootfsaddr = rootfsaddr - EXTENDED_SIZE;
292 + kerneladdr = kerneladdr - EXTENDED_SIZE;
293 + spareaddr = roundup(totallen,master->erasesize) + master->erasesize;
294 + sparelen = master->size - spareaddr - master->erasesize;
295 +
296 + /* Determine number of partitions */
297 + namelen = 8;
298 + if (rootfslen > 0){
299 + nrparts++;
300 + namelen =+ 6;
301 + };
302 + if (kernellen > 0) {
303 + nrparts++;
304 + namelen =+ 6;
305 + };
306 +
307 + /* Ask kernel for more memory */
308 + parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
309 + if (!parts) {
310 + vfree(buf);
311 + return -ENOMEM;
312 + };
313 +
314 + /* Start building partition list */
315 + parts[curpart].name = "CFE";
316 + parts[curpart].offset = 0;
317 + parts[curpart].size = master->erasesize;
318 + curpart++;
319 +
320 + if (kernellen > 0) {
321 + parts[curpart].name = "kernel";
322 + parts[curpart].offset = kerneladdr;
323 + parts[curpart].size = kernellen;
324 + curpart++;
325 + };
326 +
327 + if (rootfslen > 0) {
328 + parts[curpart].name = "rootfs";
329 + parts[curpart].offset = rootfsaddr;
330 + parts[curpart].size = rootfslen;
331 + if (sparelen > 0)
332 + parts[curpart].size += sparelen;
333 + curpart++;
334 + };
335 +
336 + parts[curpart].name = "nvram";
337 + parts[curpart].offset = master->size - master->erasesize;
338 + parts[curpart].size = master->erasesize;
339 +
340 + /* Global partition "linux" to make easy firmware upgrade */
341 + curpart++;
342 + parts[curpart].name = "linux";
343 + parts[curpart].offset = parts[0].size;
344 + parts[curpart].size = master->size - parts[0].size - parts[3].size;
345 +
346 + for (i = 0; i < nrparts; i++)
347 + printk(KERN_INFO PFX "Partition %d is %s offset %lx and length %lx\n", i, parts[i].name, parts[i].offset, parts[i].size);
348 +
349 + printk(KERN_INFO PFX "Spare partition is %x offset and length %x\n", spareaddr, sparelen);
350 + *pparts = parts;
351 + vfree(buf);
352 +
353 + return nrparts;
354 +};
355 +
356 +static int bcm963xx_detect_cfe(struct mtd_info *master)
357 +{
358 + int idoffset = 0x4e0;
359 + static char idstring[8] = "CFE1CFE1";
360 + char buf[9];
361 + int ret;
362 + size_t retlen;
363 +
364 + ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
365 + buf[retlen] = 0;
366 + printk(KERN_INFO PFX "Read Signature value of %s\n", buf);
367 +
368 + return strncmp(idstring, buf, 8);
369 +}
370 +
371 +static int bcm963xx_probe(struct platform_device *pdev)
372 +{
373 + int err = 0;
374 + int parsed_nr_parts = 0;
375 + char *part_type;
376 + struct resource *r;
377 +
378 + r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
379 + bcm963xx_map.phys = r->start;
380 + bcm963xx_map.size = (r->end - r->start) + 1;
381 + bcm963xx_map.virt = ioremap(r->start, r->end - r->start + 1);
382 +
383 + if (!bcm963xx_map.virt) {
384 + printk(KERN_ERR PFX "Failed to ioremap\n");
385 + return -EIO;
386 + }
387 + printk(KERN_INFO PFX "0x%08lx at 0x%08x\n", bcm963xx_map.size, bcm963xx_map.phys);
388 +
389 + simple_map_init(&bcm963xx_map);
390 +
391 + bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
392 + if (!bcm963xx_mtd_info) {
393 + printk(KERN_ERR PFX "Failed to probe using CFI\n");
394 + err = -EIO;
395 + goto err_probe;
396 + }
397 +
398 + bcm963xx_mtd_info->owner = THIS_MODULE;
399 +
400 + /* This is mutually exclusive */
401 + if (bcm963xx_detect_cfe(bcm963xx_mtd_info) == 0) {
402 + printk(KERN_INFO PFX "CFE bootloader detected\n");
403 + if (parsed_nr_parts == 0) {
404 + int ret = parse_cfe_partitions(bcm963xx_mtd_info, &parsed_parts);
405 + if (ret > 0) {
406 + part_type = "CFE";
407 + parsed_nr_parts = ret;
408 + }
409 + }
410 + } else {
411 + printk(KERN_INFO PFX "assuming RedBoot bootloader\n");
412 + if (bcm963xx_mtd_info->size > 0x00400000) {
413 + printk(KERN_INFO PFX "Support for extended flash memory size : 0x%lx ; ONLY 64MBIT SUPPORT\n", bcm963xx_mtd_info->size);
414 + bcm963xx_map.virt = (u32)(EXTENDED_SIZE);
415 + }
416 +
417 +#ifdef CONFIG_MTD_REDBOOT_PARTS
418 + if (parsed_nr_parts == 0) {
419 + int ret = parse_redboot_partitions(bcm963xx_mtd_info, &parsed_parts, 0);
420 + if (ret > 0) {
421 + part_type = "RedBoot";
422 + parsed_nr_parts = ret;
423 + }
424 + }
425 +#endif
426 + }
427 +
428 + return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, parsed_nr_parts);
429 +
430 +err_probe:
431 + iounmap(bcm963xx_map.virt);
432 + return err;
433 +}
434 +
435 +static int bcm963xx_remove(struct platform_device *pdev)
436 +{
437 + if (bcm963xx_mtd_info) {
438 + del_mtd_partitions(bcm963xx_mtd_info);
439 + map_destroy(bcm963xx_mtd_info);
440 + }
441 +
442 + if (bcm963xx_map.virt) {
443 + iounmap(bcm963xx_map.virt);
444 + bcm963xx_map.virt = 0;
445 + }
446 +
447 + return 0;
448 +}
449 +
450 +static struct platform_driver bcm63xx_mtd_dev = {
451 + .probe = bcm963xx_probe,
452 + .remove = bcm963xx_remove,
453 + .driver = {
454 + .name = "bcm963xx-flash",
455 + .owner = THIS_MODULE,
456 + },
457 +};
458 +
459 +static int __init bcm963xx_mtd_init(void)
460 +{
461 + return platform_driver_register(&bcm63xx_mtd_dev);
462 +}
463 +
464 +static void __exit bcm963xx_mtd_exit(void)
465 +{
466 + platform_driver_unregister(&bcm63xx_mtd_dev);
467 +}
468 +
469 +module_init(bcm963xx_mtd_init);
470 +module_exit(bcm963xx_mtd_exit);
471 +
472 +MODULE_LICENSE("GPL");
473 +MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
474 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
475 +MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
476 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
477 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
478 @@ -722,20 +722,6 @@ static int board_get_mac_address(u8 *mac
479 return 0;
480 }
481
482 -static struct mtd_partition mtd_partitions[] = {
483 - {
484 - .name = "cfe",
485 - .offset = 0x0,
486 - .size = 0x40000,
487 - }
488 -};
489 -
490 -static struct physmap_flash_data flash_data = {
491 - .width = 2,
492 - .nr_parts = ARRAY_SIZE(mtd_partitions),
493 - .parts = mtd_partitions,
494 -};
495 -
496 static struct resource mtd_resources[] = {
497 {
498 .start = 0, /* filled at runtime */
499 @@ -745,12 +731,9 @@ static struct resource mtd_resources[] =
500 };
501
502 static struct platform_device mtd_dev = {
503 - .name = "physmap-flash",
504 + .name = "bcm963xx-flash",
505 .resource = mtd_resources,
506 .num_resources = ARRAY_SIZE(mtd_resources),
507 - .dev = {
508 - .platform_data = &flash_data,
509 - },
510 };
511
512 /*