1 --- a/arch/mips/include/asm/mach-bcm47xx/bus.h
2 +++ b/arch/mips/include/asm/mach-bcm47xx/bus.h
5 #include <linux/ssb/ssb.h>
6 #include <linux/bcma/bcma.h>
7 +#include <linux/mtd/mtd.h>
10 struct bcm47xx_sflash {
11 @@ -28,6 +29,8 @@ struct bcm47xx_sflash {
12 u32 blocksize; /* Block size */
13 u32 numblocks; /* Number of blocks */
14 u32 size; /* Total size in bytes */
16 + struct mtd_info *mtd;
19 void bcm47xx_sflash_struct_bcma_init(struct bcm47xx_sflash *sflash, struct bcma_drv_cc *bcc);
20 --- a/drivers/mtd/maps/Kconfig
21 +++ b/drivers/mtd/maps/Kconfig
22 @@ -257,6 +257,15 @@ config MTD_BCM47XX_PFLASH
24 Support for bcm47xx parallel flash
26 +config MTD_BCM47XX_SFLASH
27 + tristate "bcm47xx serial flash support"
30 + select MTD_PARTITIONS
31 + select MTD_BCM47XX_PARTS
33 + Support for bcm47xx parallel flash
36 tristate "CFI Flash device mapped on DIL/Net PC"
37 depends on X86 && MTD_CFI_INTELEXT && BROKEN
38 --- a/drivers/mtd/maps/Makefile
39 +++ b/drivers/mtd/maps/Makefile
40 @@ -58,3 +58,4 @@ obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr
41 obj-$(CONFIG_MTD_LATCH_ADDR) += latch-addr-flash.o
42 obj-$(CONFIG_MTD_LANTIQ) += lantiq-flash.o
43 obj-$(CONFIG_MTD_BCM47XX_PFLASH)+= bcm47xx-pflash.o
44 +obj-$(CONFIG_MTD_BCM47XX_SFLASH)+= bcm47xx-sflash.o
46 +++ b/drivers/mtd/maps/bcm47xx-sflash.c
49 + * Broadcom SiliconBackplane chipcommon serial flash interface
51 + * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
52 + * Copyright 2006, Broadcom Corporation
53 + * All Rights Reserved.
55 + * Licensed under the GNU/GPL. See COPYING for details.
58 +#define pr_fmt(fmt) "bcm47xx_sflash: " fmt
59 +#include <linux/module.h>
60 +#include <linux/slab.h>
61 +#include <linux/ioport.h>
62 +#include <linux/sched.h>
63 +#include <linux/mtd/mtd.h>
64 +#include <linux/mtd/map.h>
65 +#include <linux/mtd/partitions.h>
66 +#include <linux/errno.h>
67 +#include <linux/delay.h>
68 +#include <linux/platform_device.h>
73 +sflash_mtd_poll(struct bcm47xx_sflash *sflash, unsigned int offset, int timeout)
75 + unsigned long now = jiffies;
78 + if (!sflash->poll(sflash, offset)) {
81 + if (time_after(jiffies, now + timeout)) {
82 + pr_err("timeout while polling\n");
94 +sflash_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
96 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *)mtd->priv;
98 + /* Check address range */
102 + if ((from + len) > mtd->size)
107 + int ret = sflash->read(sflash, from, len, buf);
111 + from += (loff_t) ret;
121 +sflash_mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
125 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *)mtd->priv;
127 + /* Check address range */
131 + if ((to + len) > mtd->size)
136 + ret = sflash->write(sflash, to, len, buf);
142 + ret = sflash_mtd_poll(sflash, (unsigned int) to, HZ / 10);
146 + to += (loff_t) bytes;
156 +sflash_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
158 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *) mtd->priv;
160 + unsigned int addr, len;
162 + /* Check address range */
165 + if ((erase->addr + erase->len) > mtd->size)
168 + addr = erase->addr;
171 + /* Ensure that requested regions are aligned */
172 + for (i = 0; i < mtd->numeraseregions; i++) {
173 + for (j = 0; j < mtd->eraseregions[i].numblocks; j++) {
174 + if (addr == mtd->eraseregions[i].offset +
175 + mtd->eraseregions[i].erasesize * j &&
176 + len >= mtd->eraseregions[i].erasesize) {
177 + ret = sflash->erase(sflash, addr);
180 + ret = sflash_mtd_poll(sflash, addr, 10 * HZ);
183 + addr += mtd->eraseregions[i].erasesize;
184 + len -= mtd->eraseregions[i].erasesize;
191 + /* Set erase status */
193 + erase->state = MTD_ERASE_FAILED;
195 + erase->state = MTD_ERASE_DONE;
197 + /* Call erase callback */
198 + if (erase->callback)
199 + erase->callback(erase);
204 +static const char *probes[] = { "bcm47xx", NULL };
206 +static int bcm47xx_sflash_probe(struct platform_device *pdev)
208 + struct bcm47xx_sflash *sflash = dev_get_platdata(&pdev->dev);
209 + struct mtd_info *mtd;
210 + struct mtd_erase_region_info *eraseregions;
213 + mtd = kzalloc(sizeof(struct mtd_info), GFP_KERNEL);
219 + eraseregions = kzalloc(sizeof(struct mtd_erase_region_info), GFP_KERNEL);
220 + if (!eraseregions) {
225 + pr_info("found serial flash: blocksize=%dKB, numblocks=%d, size=%dKB\n",
226 + sflash->blocksize / 1024, sflash->numblocks, sflash->size / 1024);
228 + /* Setup region info */
229 + eraseregions->offset = 0;
230 + eraseregions->erasesize = sflash->blocksize;
231 + eraseregions->numblocks = sflash->numblocks;
232 + if (eraseregions->erasesize > mtd->erasesize)
233 + mtd->erasesize = eraseregions->erasesize;
234 + mtd->size = sflash->size;
235 + mtd->numeraseregions = 1;
237 + /* Register with MTD */
238 + mtd->name = "bcm47xx-sflash";
239 + mtd->type = MTD_NORFLASH;
240 + mtd->flags = MTD_CAP_NORFLASH;
241 + mtd->eraseregions = eraseregions;
242 + mtd->erase = sflash_mtd_erase;
243 + mtd->read = sflash_mtd_read;
244 + mtd->write = sflash_mtd_write;
245 + mtd->writesize = 1;
246 + mtd->priv = sflash;
247 + ret = dev_set_drvdata(&pdev->dev, mtd);
248 + mtd->owner = THIS_MODULE;
250 + pr_err("adding private data failed\n");
251 + goto err_free_eraseregions;
254 + ret = mtd_device_parse_register(mtd, probes, NULL, NULL, 0);
257 + pr_err("mtd_device_register failed\n");
258 + goto err_free_eraseregions;
262 +err_free_eraseregions:
263 + kfree(eraseregions);
270 +static int __devexit bcm47xx_sflash_remove(struct platform_device *pdev)
272 + struct mtd_info *mtd = dev_get_drvdata(&pdev->dev);
275 + mtd_device_unregister(mtd);
277 + kfree(mtd->eraseregions);
279 + dev_set_drvdata(&pdev->dev, NULL);
284 +static struct platform_driver bcm47xx_sflash_driver = {
285 + .remove = __devexit_p(bcm47xx_sflash_remove),
287 + .name = "bcm47xx_sflash",
288 + .owner = THIS_MODULE,
292 +static int __init init_bcm47xx_sflash(void)
294 + int ret = platform_driver_probe(&bcm47xx_sflash_driver, bcm47xx_sflash_probe);
297 + pr_err("error registering platform driver: %i\n", ret);
301 +static void __exit exit_bcm47xx_sflash(void)
303 + platform_driver_unregister(&bcm47xx_sflash_driver);
306 +module_init(init_bcm47xx_sflash);
307 +module_exit(exit_bcm47xx_sflash);
309 +MODULE_LICENSE("GPL");
310 +MODULE_DESCRIPTION("BCM47XX parallel flash driver");