Messages in this thread Patch in this message | | | From | Bean Huo 霍斌斌 (beanhuo) <> | Subject | [PATCH 1/1 v2] driver:mtd:spi-nor:fix spi_nor_scan overwrite platform ID point | Date | Tue, 14 Oct 2014 01:26:49 +0000 |
| |
This patch used to modify the method of spi_nor_scan overwrite platform ID point.
If type of platform data match with the name of spi_nor_ids set, and JEDEC ID also match with INFO ID of spi_nor_ids set,spi device ID point(this is before probed according to device name) shouldn't be overwrote.Otherwise,this point will be overwrote by new spi_nor_ids set point that probed according to JEDEC ID.
Signed-off-by: bean huo <beanhuo@micron.com> --- v1-v2: add extended ID match judgment.
drivers/mtd/spi-nor/spi-nor.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index b5ad6be..3bb8077 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -963,16 +963,23 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id, return PTR_ERR(jid); } else if (jid != id) { /* - * JEDEC knows better, so overwrite platform ID. We - * can't trust partitions any longer, but we'll let - * mtd apply them anyway, since some partitions may be - * marked read-only, and we don't want to lose that - * information, even if it's not 100% accurate. + * If type of platform data match with the name of + * spi_nor_ids set,and JEDEC ID also match with + * INFO ID of spi_nor_ids set,shouldn't overwrite + * spi device info point.Otherwise,will overwrite + * it. */ - dev_warn(dev, "found %s, expected %s\n", - jid->name, id->name); - id = jid; - info = (void *)jid->driver_data; + struct flash_info *tmpinfo; + + tmpinfo = (void *)jid->driver_data; + if (tmpinfo->jedec_id != info->jedec_id || + (info->ext_id != 0 && + tmpinfo->ext_id != info->ext_id)) { + dev_warn(dev, "found %s, expected %s\n", + jid->name, id->name); + id = jid; + info = (void *)jid->driver_data; + } } } -- 1.7.9.5
| |