Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a08e933 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Cyrille Pitchen
Browse files

mtd: spi-nor: add dt support for Everspin MRAMs 



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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
parent 9e43486a

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ Required properties: 
                 at25df641

                 at26df081a

                 mr25h256

                 mr25h10

                 mr25h40

                 mx25l4005a

                 mx25l1606e

                 mx25l6405d

drivers/mtd/devices/m25p80.c

+5 −1
Original line number Diff line number Diff line
@@ -289,7 +289,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"},
@@ -306,6 +305,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);