From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRyGw-00088w-Pv for linux-mtd@lists.infradead.org; Fri, 13 Jan 2017 09:35:49 +0000 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Masahiko Iwamoto , Jagan Teki , Marek Vasut , Cyrille Pitchen Cc: linux-mtd@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH] mtd: spi-nor: don't claim mr25h40 to be JEDEC compatible Date: Fri, 13 Jan 2017 10:35:09 +0100 Message-Id: <20170113093509.25737-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Commit edd0c8f4932d ("mtd: spi-nor: Add support for mr25h40") made it possible to use a mr25h40 by writing compatible = "mr25h40", "jedec,spi-nor"; in a device tree. This chip however isn't JEDEC compatible however, so change the chip string and add a compatible entry to bless compatible = "mr25h40-nonjedec"; as the right way. Fixes: edd0c8f4932d ("mtd: spi-nor: Add support for mr25h40") Signed-off-by: Uwe Kleine-König --- drivers/mtd/devices/m25p80.c | 1 + drivers/mtd/spi-nor/spi-nor.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 9cf7fcd28034..bd0c335692d2 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -304,6 +304,7 @@ static const struct spi_device_id m25p_ids[] = { {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, + {"mr25h40-nonjedec"}, { }, }; diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index bbdbbd763c9d..3a8042fe44f0 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -825,7 +825,7 @@ static const struct flash_info spi_nor_ids[] = { /* Everspin */ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, - { "mr25h40", CAT25_INFO(512 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, + { "mr25h40-nonjedec", CAT25_INFO(512 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) }, /* Fujitsu */ { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) }, -- 2.11.0