mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
* Add device tree support for DoC3 * SPI NOR: Refactoring, for better layering between spi-nor.c and its driver users (e.g., m25p80.c) New flash device support Support 6-byte ID strings * NAND New NAND driver for Allwinner SoC's (sunxi) GPMI NAND: add support for raw (no ECC) access, for testing purposes Add ATO manufacturer ID A few odd driver fixes * MTD tests: Allow testers to compensate for OOB bitflips in oobtest Fix a torturetest regression * nandsim: Support longer ID byte strings And more. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUj6PbAAoJEFySrpd9RFgtahcP/RGvknk9lnitaZI7+aZPP8Zs AopfiuisLNv3v87EEBAWGYjRYm6vuuhO1z3K55iOIlemBVzoMIP0jf68XGy9uXnL Ox6AHqxm55wwmc+CHry5/GssaqE6GzdPm8TBP+AGGNhHrhc+raJL55R0QJaoYVwX pUxkhWaa4lZ6CrOIMQ3n+MEnduilHZoFIcXSc1UtI0y9IXsf1m0Qs8M5jGN8BQ16 HOVNJN9wOXF89swoi7bKsyAn+QFUYgdksAisncb6b9r5Ks5KHmcOuS1LM5X9YoUr KfeogHfDM68fcaHsSvMU1xmxjXGtE+HFJE52eYNPB1fNbT3JAC13FFj92GeSsZtE ekpCQh4OPLazT/2wCUHTQwC7T1dCilwyW7VJB9MSl7fSBo9P7jIiUHxVUdM43kez Di02/XWi4IULTwrgzZiTT8yplFrVdvkmKHAAFEIoaVWiF/l4DeSodLGUw7owmNYn rJPBPQulpPHRwKZY7gThJuOUXpgbT715GSbvmPYXimHBqmViiPkrhqQ/b/v4PRRs Nlfhwbswr7WBq6vmPkd6eOyfdFANmWcZQMp/++BCdI/7mhfaik72GWMTBSuJ7hN5 PB+z95soHaKBWlbiDGGGPvuqJmPkOVq1R8itQdIYBWEh7eNSHecwVxyUJJ+V3oPv QkD7mEP2ZozZe3Ys2EJQ =gDW8 -----END PGP SIGNATURE----- Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd Pull MTD updates from Brian Norris: "Summary: - Add device tree support for DoC3 - SPI NOR: Refactoring, for better layering between spi-nor.c and its driver users (e.g., m25p80.c) New flash device support Support 6-byte ID strings - NAND: New NAND driver for Allwinner SoC's (sunxi) GPMI NAND: add support for raw (no ECC) access, for testing purposes Add ATO manufacturer ID A few odd driver fixes - MTD tests: Allow testers to compensate for OOB bitflips in oobtest Fix a torturetest regression - nandsim: Support longer ID byte strings And more" * tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd: (63 commits) mtd: tests: abort torturetest on erase errors mtd: physmap_of: fix potential NULL dereference mtd: spi-nor: allow NULL as chip name and try to auto detect it mtd: nand: gpmi: add raw oob access functions mtd: nand: gpmi: add proper raw access support mtd: nand: gpmi: add gpmi_copy_bits function mtd: spi-nor: factor out write_enable() for erase commands mtd: spi-nor: add support for s25fl128s mtd: spi-nor: remove the jedec_id/ext_id mtd: spi-nor: add id/id_len for flash_info{} mtd: nand: correct the comment of function nand_block_isreserved() jffs2: Drop bogus if in comment mtd: atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy mtd: cafe_nand: drop duplicate .write_page implementation mtd: m25p80: Add support for serial flash Spansion S25FL132K MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids mtd: spi-nor: improve wait-till-ready timeout loop mtd: delete unnecessary checks before two function calls mtd: nand: omap: Fix NAND enumeration on 3430 LDP mtd: nand: add ATO manufacturer info ...
219 lines
4.8 KiB
C
219 lines
4.8 KiB
C
/*
|
|
* drivers/mtd/nand/orion_nand.c
|
|
*
|
|
* NAND support for Marvell Orion SoC platforms
|
|
*
|
|
* Tzachi Perelstein <tzachi@marvell.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/nand.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <asm/sizes.h>
|
|
#include <linux/platform_data/mtd-orion_nand.h>
|
|
|
|
static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
|
|
{
|
|
struct nand_chip *nc = mtd->priv;
|
|
struct orion_nand_data *board = nc->priv;
|
|
u32 offs;
|
|
|
|
if (cmd == NAND_CMD_NONE)
|
|
return;
|
|
|
|
if (ctrl & NAND_CLE)
|
|
offs = (1 << board->cle);
|
|
else if (ctrl & NAND_ALE)
|
|
offs = (1 << board->ale);
|
|
else
|
|
return;
|
|
|
|
if (nc->options & NAND_BUSWIDTH_16)
|
|
offs <<= 1;
|
|
|
|
writeb(cmd, nc->IO_ADDR_W + offs);
|
|
}
|
|
|
|
static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
|
|
{
|
|
struct nand_chip *chip = mtd->priv;
|
|
void __iomem *io_base = chip->IO_ADDR_R;
|
|
uint64_t *buf64;
|
|
int i = 0;
|
|
|
|
while (len && (unsigned long)buf & 7) {
|
|
*buf++ = readb(io_base);
|
|
len--;
|
|
}
|
|
buf64 = (uint64_t *)buf;
|
|
while (i < len/8) {
|
|
/*
|
|
* Since GCC has no proper constraint (PR 43518)
|
|
* force x variable to r2/r3 registers as ldrd instruction
|
|
* requires first register to be even.
|
|
*/
|
|
register uint64_t x asm ("r2");
|
|
|
|
asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base));
|
|
buf64[i++] = x;
|
|
}
|
|
i *= 8;
|
|
while (i < len)
|
|
buf[i++] = readb(io_base);
|
|
}
|
|
|
|
static int __init orion_nand_probe(struct platform_device *pdev)
|
|
{
|
|
struct mtd_info *mtd;
|
|
struct mtd_part_parser_data ppdata = {};
|
|
struct nand_chip *nc;
|
|
struct orion_nand_data *board;
|
|
struct resource *res;
|
|
struct clk *clk;
|
|
void __iomem *io_base;
|
|
int ret = 0;
|
|
u32 val = 0;
|
|
|
|
nc = devm_kzalloc(&pdev->dev,
|
|
sizeof(struct nand_chip) + sizeof(struct mtd_info),
|
|
GFP_KERNEL);
|
|
if (!nc)
|
|
return -ENOMEM;
|
|
mtd = (struct mtd_info *)(nc + 1);
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
io_base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
|
if (IS_ERR(io_base))
|
|
return PTR_ERR(io_base);
|
|
|
|
if (pdev->dev.of_node) {
|
|
board = devm_kzalloc(&pdev->dev, sizeof(struct orion_nand_data),
|
|
GFP_KERNEL);
|
|
if (!board)
|
|
return -ENOMEM;
|
|
if (!of_property_read_u32(pdev->dev.of_node, "cle", &val))
|
|
board->cle = (u8)val;
|
|
else
|
|
board->cle = 0;
|
|
if (!of_property_read_u32(pdev->dev.of_node, "ale", &val))
|
|
board->ale = (u8)val;
|
|
else
|
|
board->ale = 1;
|
|
if (!of_property_read_u32(pdev->dev.of_node,
|
|
"bank-width", &val))
|
|
board->width = (u8)val * 8;
|
|
else
|
|
board->width = 8;
|
|
if (!of_property_read_u32(pdev->dev.of_node,
|
|
"chip-delay", &val))
|
|
board->chip_delay = (u8)val;
|
|
} else {
|
|
board = dev_get_platdata(&pdev->dev);
|
|
}
|
|
|
|
mtd->priv = nc;
|
|
mtd->owner = THIS_MODULE;
|
|
|
|
nc->priv = board;
|
|
nc->IO_ADDR_R = nc->IO_ADDR_W = io_base;
|
|
nc->cmd_ctrl = orion_nand_cmd_ctrl;
|
|
nc->read_buf = orion_nand_read_buf;
|
|
nc->ecc.mode = NAND_ECC_SOFT;
|
|
|
|
if (board->chip_delay)
|
|
nc->chip_delay = board->chip_delay;
|
|
|
|
WARN(board->width > 16,
|
|
"%d bit bus width out of range",
|
|
board->width);
|
|
|
|
if (board->width == 16)
|
|
nc->options |= NAND_BUSWIDTH_16;
|
|
|
|
if (board->dev_ready)
|
|
nc->dev_ready = board->dev_ready;
|
|
|
|
platform_set_drvdata(pdev, mtd);
|
|
|
|
/* Not all platforms can gate the clock, so it is not
|
|
an error if the clock does not exists. */
|
|
clk = clk_get(&pdev->dev, NULL);
|
|
if (!IS_ERR(clk)) {
|
|
clk_prepare_enable(clk);
|
|
clk_put(clk);
|
|
}
|
|
|
|
if (nand_scan(mtd, 1)) {
|
|
ret = -ENXIO;
|
|
goto no_dev;
|
|
}
|
|
|
|
mtd->name = "orion_nand";
|
|
ppdata.of_node = pdev->dev.of_node;
|
|
ret = mtd_device_parse_register(mtd, NULL, &ppdata,
|
|
board->parts, board->nr_parts);
|
|
if (ret) {
|
|
nand_release(mtd);
|
|
goto no_dev;
|
|
}
|
|
|
|
return 0;
|
|
|
|
no_dev:
|
|
if (!IS_ERR(clk)) {
|
|
clk_disable_unprepare(clk);
|
|
clk_put(clk);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int orion_nand_remove(struct platform_device *pdev)
|
|
{
|
|
struct mtd_info *mtd = platform_get_drvdata(pdev);
|
|
struct clk *clk;
|
|
|
|
nand_release(mtd);
|
|
|
|
clk = clk_get(&pdev->dev, NULL);
|
|
if (!IS_ERR(clk)) {
|
|
clk_disable_unprepare(clk);
|
|
clk_put(clk);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_OF
|
|
static const struct of_device_id orion_nand_of_match_table[] = {
|
|
{ .compatible = "marvell,orion-nand", },
|
|
{},
|
|
};
|
|
#endif
|
|
|
|
static struct platform_driver orion_nand_driver = {
|
|
.remove = orion_nand_remove,
|
|
.driver = {
|
|
.name = "orion_nand",
|
|
.of_match_table = of_match_ptr(orion_nand_of_match_table),
|
|
},
|
|
};
|
|
|
|
module_platform_driver_probe(orion_nand_driver, orion_nand_probe);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Tzachi Perelstein");
|
|
MODULE_DESCRIPTION("NAND glue for Orion platforms");
|
|
MODULE_ALIAS("platform:orion_nand");
|