From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout.microchip.com ([198.175.253.82] helo=email.microchip.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTTSG-0000vA-C2 for linux-mtd@lists.infradead.org; Tue, 17 Jan 2017 13:05:42 +0000 Subject: Re: [PATCH v3] mtd: spi-nor: add dt support for Everspin MRAMs To: =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= , Masahiko Iwamoto , Jagan Teki , Marek Vasut References: <480df61d-c949-b3b0-61a4-d9db17f09e7d@atmel.com> <20170117110338.10756-1-u.kleine-koenig@pengutronix.de> CC: , , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Geert Uytterhoeven , Mark Rutland , From: Cyrille Pitchen Message-ID: Date: Tue, 17 Jan 2017 14:04:29 +0100 MIME-Version: 1.0 In-Reply-To: <20170117110338.10756-1-u.kleine-koenig@pengutronix.de> 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: , Le 17/01/2017 à 12:03, Uwe Kleine-König a écrit : > The MR25 family doesn't support JEDEC, so they need explicit mentioning > in the list of supported spi IDs. This makes it possible to add these > using for example: > > compatible = "everspin,mr25h40"; > > There was already an entry for mr25h256. Move that one out of the "keep > for compatibility" section and put in a new group for Everspin MRAMs. > > Signed-off-by: Uwe Kleine-König Acked-by: Cyrille Pitchen By the way, you've forgotten to collect Marek's ack from v1 but no need to resend for that. I wait a little bit more for some DT guy ack if they want but otherwise I think this patch is ready to be merged into the spi-nor tree. Thanks ! > --- > Changes since (implicit) v1: > > - use Kib instead of kib > > Changes since v2: > > - update dt docs > - handle already existing mr25h256 in m25p_ids[] > > Thanks to Cyrille for catching these. > > Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 2 ++ > drivers/mtd/devices/m25p80.c | 6 +++++- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > index 2c91c03e7eb0..3e920ec5c4d3 100644 > --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > @@ -14,6 +14,8 @@ Required properties: > at25df641 > at26df081a > mr25h256 > + mr25h10 > + mr25h40 > mx25l4005a > mx25l1606e > mx25l6405d > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index 9cf7fcd28034..0e2d3a64651a 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -288,7 +288,6 @@ static const struct spi_device_id m25p_ids[] = { > * should be kept for backward compatibility. > */ > {"at25df321a"}, {"at25df641"}, {"at26df081a"}, > - {"mr25h256"}, > {"mx25l4005a"}, {"mx25l1606e"}, {"mx25l6405d"}, {"mx25l12805d"}, > {"mx25l25635e"},{"mx66l51235l"}, > {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q512a"}, > @@ -305,6 +304,11 @@ static const struct spi_device_id m25p_ids[] = { > {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, > {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, > > + /* Everspin MRAMs (non-JEDEC) */ > + { "mr25h256" }, /* 256 Kib, 40 MHz */ > + { "mr25h10" }, /* 1 Mib, 40 MHz */ > + { "mr25h40" }, /* 4 Mib, 40 MHz */ > + > { }, > }; > MODULE_DEVICE_TABLE(spi, m25p_ids); >