220 lines
7.2 KiB
Diff
220 lines
7.2 KiB
Diff
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||
@@ -28,6 +28,8 @@
|
||
|
||
#define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16)
|
||
|
||
+static const struct spi_device_id *spi_nor_match_id(const char *name);
|
||
+
|
||
/*
|
||
* Read the status register, returning its value in the location
|
||
* Return the status register value.
|
||
@@ -473,7 +475,7 @@ struct flash_info {
|
||
* more nor chips. This current list focusses on newer chips, which
|
||
* have been converging on command sets which including JEDEC ID.
|
||
*/
|
||
-const struct spi_device_id spi_nor_ids[] = {
|
||
+static const struct spi_device_id spi_nor_ids[] = {
|
||
/* Atmel -- some are (confusingly) marketed as "DataFlash" */
|
||
{ "at25fs010", INFO(0x1f6601, 0, 32 * 1024, 4, SECT_4K) },
|
||
{ "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8, SECT_4K) },
|
||
@@ -611,6 +613,7 @@ const struct spi_device_id spi_nor_ids[]
|
||
{ "m25px32-s0", INFO(0x207316, 0, 64 * 1024, 64, SECT_4K) },
|
||
{ "m25px32-s1", INFO(0x206316, 0, 64 * 1024, 64, SECT_4K) },
|
||
{ "m25px64", INFO(0x207117, 0, 64 * 1024, 128, 0) },
|
||
+ { "m25px80", INFO(0x207114, 0, 64 * 1024, 16, 0) },
|
||
|
||
/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
|
||
{ "w25x10", INFO(0xef3011, 0, 64 * 1024, 2, SECT_4K) },
|
||
@@ -623,7 +626,6 @@ const struct spi_device_id spi_nor_ids[]
|
||
{ "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) },
|
||
{ "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
|
||
{ "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
|
||
- { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
||
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
|
||
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
|
||
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
||
@@ -637,7 +639,6 @@ const struct spi_device_id spi_nor_ids[]
|
||
{ "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
|
||
{ },
|
||
};
|
||
-EXPORT_SYMBOL_GPL(spi_nor_ids);
|
||
|
||
static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor)
|
||
{
|
||
@@ -671,11 +672,6 @@ static const struct spi_device_id *spi_n
|
||
return ERR_PTR(-ENODEV);
|
||
}
|
||
|
||
-static const struct spi_device_id *jedec_probe(struct spi_nor *nor)
|
||
-{
|
||
- return nor->read_id(nor);
|
||
-}
|
||
-
|
||
static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
|
||
size_t *retlen, u_char *buf)
|
||
{
|
||
@@ -916,11 +912,10 @@ static int spi_nor_check(struct spi_nor
|
||
return 0;
|
||
}
|
||
|
||
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
||
- enum read_mode mode)
|
||
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
|
||
{
|
||
+ const struct spi_device_id *id = NULL;
|
||
struct flash_info *info;
|
||
- struct flash_platform_data *data;
|
||
struct device *dev = nor->dev;
|
||
struct mtd_info *mtd = nor->mtd;
|
||
struct device_node *np = dev->of_node;
|
||
@@ -931,34 +926,16 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||
if (ret)
|
||
return ret;
|
||
|
||
- /* Platform data helps sort out which chip type we have, as
|
||
- * well as how this board partitions it. If we don't have
|
||
- * a chip ID, try the JEDEC id commands; they'll work for most
|
||
- * newer chips, even if we don't recognize the particular chip.
|
||
- */
|
||
- data = dev_get_platdata(dev);
|
||
- if (data && data->type) {
|
||
- const struct spi_device_id *plat_id;
|
||
-
|
||
- for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) {
|
||
- plat_id = &spi_nor_ids[i];
|
||
- if (strcmp(data->type, plat_id->name))
|
||
- continue;
|
||
- break;
|
||
- }
|
||
-
|
||
- if (i < ARRAY_SIZE(spi_nor_ids) - 1)
|
||
- id = plat_id;
|
||
- else
|
||
- dev_warn(dev, "unrecognized id %s\n", data->type);
|
||
- }
|
||
+ id = spi_nor_match_id(name);
|
||
+ if (!id)
|
||
+ return -ENOENT;
|
||
|
||
info = (void *)id->driver_data;
|
||
|
||
if (info->jedec_id) {
|
||
const struct spi_device_id *jid;
|
||
|
||
- jid = jedec_probe(nor);
|
||
+ jid = nor->read_id(nor);
|
||
if (IS_ERR(jid)) {
|
||
return PTR_ERR(jid);
|
||
} else if (jid != id) {
|
||
@@ -990,11 +967,8 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||
write_sr(nor, 0);
|
||
}
|
||
|
||
- if (data && data->name)
|
||
- mtd->name = data->name;
|
||
- else
|
||
+ if (!mtd->name)
|
||
mtd->name = dev_name(dev);
|
||
-
|
||
mtd->type = MTD_NORFLASH;
|
||
mtd->writesize = 1;
|
||
mtd->flags = MTD_CAP_NORFLASH;
|
||
@@ -1018,6 +992,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||
nor->wait_till_ready == spi_nor_wait_till_ready)
|
||
nor->wait_till_ready = spi_nor_wait_till_fsr_ready;
|
||
|
||
+#ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
|
||
/* prefer "small sector" erase if possible */
|
||
if (info->flags & SECT_4K) {
|
||
nor->erase_opcode = SPINOR_OP_BE_4K;
|
||
@@ -1025,7 +1000,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||
} else if (info->flags & SECT_4K_PMC) {
|
||
nor->erase_opcode = SPINOR_OP_BE_4K_PMC;
|
||
mtd->erasesize = 4096;
|
||
- } else {
|
||
+ } else
|
||
+#endif
|
||
+ {
|
||
nor->erase_opcode = SPINOR_OP_SE;
|
||
mtd->erasesize = info->sector_size;
|
||
}
|
||
@@ -1141,7 +1118,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||
}
|
||
EXPORT_SYMBOL_GPL(spi_nor_scan);
|
||
|
||
-const struct spi_device_id *spi_nor_match_id(char *name)
|
||
+static const struct spi_device_id *spi_nor_match_id(const char *name)
|
||
{
|
||
const struct spi_device_id *id = spi_nor_ids;
|
||
|
||
@@ -1152,7 +1129,6 @@ const struct spi_device_id *spi_nor_matc
|
||
}
|
||
return NULL;
|
||
}
|
||
-EXPORT_SYMBOL_GPL(spi_nor_match_id);
|
||
|
||
MODULE_LICENSE("GPL");
|
||
MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>");
|
||
--- a/drivers/mtd/spi-nor/Kconfig
|
||
+++ b/drivers/mtd/spi-nor/Kconfig
|
||
@@ -7,6 +7,20 @@ menuconfig MTD_SPI_NOR
|
||
|
||
if MTD_SPI_NOR
|
||
|
||
+config MTD_SPI_NOR_USE_4K_SECTORS
|
||
+ bool "Use small 4096 B erase sectors"
|
||
+ default y
|
||
+ help
|
||
+ Many flash memories support erasing small (4096 B) sectors. Depending
|
||
+ on the usage this feature may provide performance gain in comparison
|
||
+ to erasing whole blocks (32/64 KiB).
|
||
+ Changing a small part of the flash's contents is usually faster with
|
||
+ small sectors. On the other hand erasing should be faster when using
|
||
+ 64 KiB block instead of 16 × 4 KiB sectors.
|
||
+
|
||
+ Please note that some tools/drivers/filesystems may not work with
|
||
+ 4096 B erase size (e.g. UBIFS requires 15 KiB as a minimum).
|
||
+
|
||
config SPI_FSL_QUADSPI
|
||
tristate "Freescale Quad SPI controller"
|
||
depends on ARCH_MXC
|
||
--- a/include/linux/mtd/spi-nor.h
|
||
+++ b/include/linux/mtd/spi-nor.h
|
||
@@ -187,32 +187,17 @@ struct spi_nor {
|
||
/**
|
||
* spi_nor_scan() - scan the SPI NOR
|
||
* @nor: the spi_nor structure
|
||
- * @id: the spi_device_id provided by the driver
|
||
+ * @name: the chip type name
|
||
* @mode: the read mode supported by the driver
|
||
*
|
||
* The drivers can use this fuction to scan the SPI NOR.
|
||
* In the scanning, it will try to get all the necessary information to
|
||
* fill the mtd_info{} and the spi_nor{}.
|
||
*
|
||
- * The board may assigns a spi_device_id with @id which be used to compared with
|
||
- * the spi_device_id detected by the scanning.
|
||
+ * The chip type name can be provided through the @name parameter.
|
||
*
|
||
* Return: 0 for success, others for failure.
|
||
*/
|
||
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
||
- enum read_mode mode);
|
||
-extern const struct spi_device_id spi_nor_ids[];
|
||
-
|
||
-/**
|
||
- * spi_nor_match_id() - find the spi_device_id by the name
|
||
- * @name: the name of the spi_device_id
|
||
- *
|
||
- * The drivers use this function to find the spi_device_id
|
||
- * specified by the @name.
|
||
- *
|
||
- * Return: returns the right spi_device_id pointer on success,
|
||
- * and returns NULL on failure.
|
||
- */
|
||
-const struct spi_device_id *spi_nor_match_id(char *name);
|
||
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode);
|
||
|
||
#endif
|