1 --- a/drivers/mtd/maps/Kconfig
2 +++ b/drivers/mtd/maps/Kconfig
3 @@ -257,6 +257,15 @@ config MTD_BCM47XX_PFLASH
5 Support for bcm47xx parallel flash
7 +config MTD_BCM47XX_SFLASH
8 + tristate "bcm47xx serial flash support"
11 + select MTD_PARTITIONS
12 + select MTD_BCM47XX_PARTS
14 + Support for bcm47xx parallel flash
17 tristate "CFI Flash device mapped on DIL/Net PC"
18 depends on X86 && MTD_CFI_INTELEXT && BROKEN
19 --- a/drivers/mtd/maps/Makefile
20 +++ b/drivers/mtd/maps/Makefile
21 @@ -58,3 +58,4 @@ obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr
22 obj-$(CONFIG_MTD_LATCH_ADDR) += latch-addr-flash.o
23 obj-$(CONFIG_MTD_LANTIQ) += lantiq-flash.o
24 obj-$(CONFIG_MTD_BCM47XX_PFLASH)+= bcm47xx-pflash.o
25 +obj-$(CONFIG_MTD_BCM47XX_SFLASH)+= bcm47xx-sflash.o
27 +++ b/drivers/mtd/maps/bcm47xx-sflash.c
30 + * Broadcom SiliconBackplane chipcommon serial flash interface
32 + * Copyright 2011, 2012, Hauke Mehrtens <hauke@hauke-m.de>
33 + * Copyright 2006, Broadcom Corporation
34 + * All Rights Reserved.
36 + * Licensed under the GNU/GPL. See COPYING for details.
39 +#define pr_fmt(fmt) "bcm47xx_sflash: " fmt
40 +#include <linux/module.h>
41 +#include <linux/slab.h>
42 +#include <linux/ioport.h>
43 +#include <linux/sched.h>
44 +#include <linux/mtd/mtd.h>
45 +#include <linux/mtd/map.h>
46 +#include <linux/mtd/partitions.h>
47 +#include <linux/errno.h>
48 +#include <linux/delay.h>
49 +#include <linux/platform_device.h>
54 +sflash_mtd_poll(struct bcm47xx_sflash *sflash, unsigned int offset, int timeout)
56 + unsigned long now = jiffies;
59 + if (!sflash->poll(sflash, offset)) {
62 + if (time_after(jiffies, now + timeout)) {
63 + pr_err("timeout while polling\n");
75 +sflash_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
77 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *)mtd->priv;
79 + /* Check address range */
83 + if ((from + len) > mtd->size)
88 + int ret = sflash->read(sflash, from, len, buf);
92 + from += (loff_t) ret;
102 +sflash_mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
106 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *)mtd->priv;
108 + /* Check address range */
112 + if ((to + len) > mtd->size)
117 + ret = sflash->write(sflash, to, len, buf);
123 + ret = sflash_mtd_poll(sflash, (unsigned int) to, HZ / 10);
127 + to += (loff_t) bytes;
137 +sflash_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
139 + struct bcm47xx_sflash *sflash = (struct bcm47xx_sflash *) mtd->priv;
141 + unsigned int addr, len;
143 + /* Check address range */
146 + if ((erase->addr + erase->len) > mtd->size)
149 + addr = erase->addr;
152 + /* Ensure that requested regions are aligned */
153 + for (i = 0; i < mtd->numeraseregions; i++) {
154 + for (j = 0; j < mtd->eraseregions[i].numblocks; j++) {
155 + if (addr == mtd->eraseregions[i].offset +
156 + mtd->eraseregions[i].erasesize * j &&
157 + len >= mtd->eraseregions[i].erasesize) {
158 + ret = sflash->erase(sflash, addr);
161 + ret = sflash_mtd_poll(sflash, addr, 10 * HZ);
164 + addr += mtd->eraseregions[i].erasesize;
165 + len -= mtd->eraseregions[i].erasesize;
172 + /* Set erase status */
174 + erase->state = MTD_ERASE_FAILED;
176 + erase->state = MTD_ERASE_DONE;
178 + /* Call erase callback */
179 + if (erase->callback)
180 + erase->callback(erase);
185 +static const char *probes[] = { "bcm47xx", NULL };
187 +static int bcm47xx_sflash_probe(struct platform_device *pdev)
189 + struct bcm47xx_sflash *sflash = dev_get_platdata(&pdev->dev);
190 + struct mtd_info *mtd;
191 + struct mtd_erase_region_info *eraseregions;
194 + mtd = kzalloc(sizeof(struct mtd_info), GFP_KERNEL);
200 + eraseregions = kzalloc(sizeof(struct mtd_erase_region_info), GFP_KERNEL);
201 + if (!eraseregions) {
206 + pr_info("found serial flash: blocksize=%dKB, numblocks=%d, size=%dKB\n",
207 + sflash->blocksize / 1024, sflash->numblocks, sflash->size / 1024);
209 + /* Setup region info */
210 + eraseregions->offset = 0;
211 + eraseregions->erasesize = sflash->blocksize;
212 + eraseregions->numblocks = sflash->numblocks;
213 + if (eraseregions->erasesize > mtd->erasesize)
214 + mtd->erasesize = eraseregions->erasesize;
215 + mtd->size = sflash->size;
216 + mtd->numeraseregions = 1;
218 + /* Register with MTD */
219 + mtd->name = "bcm47xx-sflash";
220 + mtd->type = MTD_NORFLASH;
221 + mtd->flags = MTD_CAP_NORFLASH;
222 + mtd->eraseregions = eraseregions;
223 + mtd->erase = sflash_mtd_erase;
224 + mtd->read = sflash_mtd_read;
225 + mtd->write = sflash_mtd_write;
226 + mtd->writesize = 1;
227 + mtd->priv = sflash;
228 + ret = dev_set_drvdata(&pdev->dev, mtd);
229 + mtd->owner = THIS_MODULE;
231 + pr_err("adding private data failed\n");
232 + goto err_free_eraseregions;
235 + ret = mtd_device_parse_register(mtd, probes, NULL, NULL, 0);
238 + pr_err("mtd_device_register failed\n");
239 + goto err_free_eraseregions;
243 +err_free_eraseregions:
244 + kfree(eraseregions);
251 +static int __devexit bcm47xx_sflash_remove(struct platform_device *pdev)
253 + struct mtd_info *mtd = dev_get_drvdata(&pdev->dev);
256 + mtd_device_unregister(mtd);
258 + kfree(mtd->eraseregions);
260 + dev_set_drvdata(&pdev->dev, NULL);
265 +static struct platform_driver bcm47xx_sflash_driver = {
266 + .remove = __devexit_p(bcm47xx_sflash_remove),
268 + .name = "bcm47xx_sflash",
269 + .owner = THIS_MODULE,
273 +static int __init init_bcm47xx_sflash(void)
275 + int ret = platform_driver_probe(&bcm47xx_sflash_driver, bcm47xx_sflash_probe);
278 + pr_err("error registering platform driver: %i\n", ret);
282 +static void __exit exit_bcm47xx_sflash(void)
284 + platform_driver_unregister(&bcm47xx_sflash_driver);
287 +module_init(init_bcm47xx_sflash);
288 +module_exit(exit_bcm47xx_sflash);
290 +MODULE_LICENSE("GPL");
291 +MODULE_DESCRIPTION("BCM47XX parallel flash driver");