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 1cRydo-0001eN-0j for linux-mtd@lists.infradead.org; Fri, 13 Jan 2017 09:59:27 +0000 Date: Fri, 13 Jan 2017 10:58:50 +0100 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: =?utf-8?B?UmFmYcWCIE1pxYJlY2tp?= Cc: Masahiko Iwamoto , Jagan Teki , Marek Vasut , Cyrille Pitchen , "linux-mtd@lists.infradead.org" , Sascha Hauer Subject: Re: [PATCH] mtd: spi-nor: don't claim mr25h40 to be JEDEC compatible Message-ID: <20170113095850.43f55n3k244o4jvz@pengutronix.de> References: <20170113093509.25737-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, Jan 13, 2017 at 10:51:47AM +0100, Rafał Miłecki wrote: > On 13 January 2017 at 10:35, Uwe Kleine-König > wrote: > > 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) }, ^------. I missed to remove the double space here |. > > /* Fujitsu */ > > { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) }, > > It seems every flash for which we use CAT25_INFO should be named with > -nonjedec suffix. > > Names mr25h10, mr25h40, cat25c11, cat25c03 cat25c09, cat25c17 and > cat25128 are not even part of m25p80 (or any other driver). Is it > possible to use them at all? Maybe we should just rename all these > entries? I suspect they are usable (as was mr25h40 without my patch) using compatible = "$name-here", "jedec,spi-nor"; . For each chip this is either wrong (because it doesn't support JEDEC) or the listing is not necessary because it can be determined using JEDEC. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |