diff options
Diffstat (limited to 'drivers/mtd/devices/mtd_dataflash.c')
| -rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 7980a91e19..80d16dec10 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel AT45xxx DataFlash MTD driver for lightweight SPI framework * * Largely derived from at91_dataflash.c: * Copyright (C) 2003-2005 SAN People (Pty) Ltd - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. -*/ + */ #include <common.h> #include <init.h> #include <malloc.h> @@ -21,7 +17,6 @@ #include <clock.h> #include <spi/spi.h> -#include <spi/flash.h> #include <linux/math64.h> #include <linux/mtd/mtd.h> @@ -213,10 +208,6 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) } } - /* Inform MTD subsystem that erase is complete */ - instr->state = MTD_ERASE_DONE; - mtd_erase_callback(instr); - return 0; } @@ -607,7 +598,6 @@ add_dataflash_otp(struct spi_device *spi, char *name, { struct dataflash *priv; struct mtd_info *device; - struct flash_platform_data *pdata = spi->dev.platform_data; char *otp_tag = ""; int err = 0; @@ -625,18 +615,18 @@ add_dataflash_otp(struct spi_device *spi, char *name, name); device = &priv->mtd; - device->name = (pdata && pdata->name) ? pdata->name : "dataflash"; + device->name = "dataflash"; device->size = nr_pages * (uint64_t)pagesize; device->erasesize = pagesize; device->writesize = pagesize; device->type = MTD_DATAFLASH; device->flags = MTD_WRITEABLE; - device->erase = dataflash_erase; - device->read = dataflash_read; - device->write = dataflash_write; + device->_erase = dataflash_erase; + device->_read = dataflash_read; + device->_write = dataflash_write; device->priv = priv; - device->parent = &spi->dev; + device->dev.parent = &spi->dev; if (revision >= 'c') otp_tag = otp_setup(device, revision); @@ -824,7 +814,7 @@ static struct flash_info * jedec_probe(struct spi_device *spi) * AT45DB0642 64Mbit (8M) xx111xxx (0x3c) 8192 1056 11 * AT45DB1282 128Mbit (16M) xx0100xx (0x10) 16384 1056 11 */ -static int dataflash_probe(struct device_d *dev) +static int dataflash_probe(struct device *dev) { struct spi_device *spi = (struct spi_device *)dev->type_data; int status; @@ -905,8 +895,9 @@ static __maybe_unused struct of_device_id dataflash_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, dataflash_dt_ids); -static struct driver_d dataflash_driver = { +static struct driver dataflash_driver = { .name = "mtd_dataflash", .probe = dataflash_probe, .of_compatible = DRV_OF_COMPAT(dataflash_dt_ids), |