|
@@ -141,6 +141,37 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
|
|
|
return gpio_get_value(host->board->rdy_pin);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * Minimal-overhead PIO for data access.
|
|
|
+ */
|
|
|
+static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len)
|
|
|
+{
|
|
|
+ struct nand_chip *nand_chip = mtd->priv;
|
|
|
+
|
|
|
+ __raw_readsb(nand_chip->IO_ADDR_R, buf, len);
|
|
|
+}
|
|
|
+
|
|
|
+static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
|
|
|
+{
|
|
|
+ struct nand_chip *nand_chip = mtd->priv;
|
|
|
+
|
|
|
+ __raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
|
|
|
+}
|
|
|
+
|
|
|
+static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
|
|
|
+{
|
|
|
+ struct nand_chip *nand_chip = mtd->priv;
|
|
|
+
|
|
|
+ __raw_writesb(nand_chip->IO_ADDR_W, buf, len);
|
|
|
+}
|
|
|
+
|
|
|
+static void atmel_write_buf16(struct mtd_info *mtd, const u8 *buf, int len)
|
|
|
+{
|
|
|
+ struct nand_chip *nand_chip = mtd->priv;
|
|
|
+
|
|
|
+ __raw_writesw(nand_chip->IO_ADDR_W, buf, len / 2);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* write oob for small pages
|
|
|
*/
|
|
@@ -436,8 +467,14 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
|
|
|
|
|
|
nand_chip->chip_delay = 20; /* 20us command delay time */
|
|
|
|
|
|
- if (host->board->bus_width_16) /* 16-bit bus width */
|
|
|
+ if (host->board->bus_width_16) { /* 16-bit bus width */
|
|
|
nand_chip->options |= NAND_BUSWIDTH_16;
|
|
|
+ nand_chip->read_buf = atmel_read_buf16;
|
|
|
+ nand_chip->write_buf = atmel_write_buf16;
|
|
|
+ } else {
|
|
|
+ nand_chip->read_buf = atmel_read_buf;
|
|
|
+ nand_chip->write_buf = atmel_write_buf;
|
|
|
+ }
|
|
|
|
|
|
platform_set_drvdata(pdev, host);
|
|
|
atmel_nand_enable(host);
|
|
@@ -546,7 +583,7 @@ err_nand_ioremap:
|
|
|
/*
|
|
|
* Remove a NAND device.
|
|
|
*/
|
|
|
-static int __devexit atmel_nand_remove(struct platform_device *pdev)
|
|
|
+static int __exit atmel_nand_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct atmel_nand_host *host = platform_get_drvdata(pdev);
|
|
|
struct mtd_info *mtd = &host->mtd;
|
|
@@ -564,8 +601,7 @@ static int __devexit atmel_nand_remove(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
static struct platform_driver atmel_nand_driver = {
|
|
|
- .probe = atmel_nand_probe,
|
|
|
- .remove = atmel_nand_remove,
|
|
|
+ .remove = __exit_p(atmel_nand_remove),
|
|
|
.driver = {
|
|
|
.name = "atmel_nand",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -574,7 +610,7 @@ static struct platform_driver atmel_nand_driver = {
|
|
|
|
|
|
static int __init atmel_nand_init(void)
|
|
|
{
|
|
|
- return platform_driver_register(&atmel_nand_driver);
|
|
|
+ return platform_driver_probe(&atmel_nand_driver, atmel_nand_probe);
|
|
|
}
|
|
|
|
|
|
|