Skip to contentSkip to conversation

mtd: spi-nor: Add support for mr25h128

PATCH Applied Philipp Puschmann 2 participants 2 messages Oct 19, 2017 – Oct 29, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: spi-nor: Add support for mr25h128

Add Everspin mr25h128 16KB MRAM to the list of supported chips.

---
 Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 1 +
 drivers/mtd/devices/m25p80.c                            | 1 +
 drivers/mtd/spi-nor/spi-nor.c                           | 1 +
 3 files changed, 3 insertions(+)
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +1 -0
index 9ce35af8507c..956bb046e599 100644
@@ -13,6 +13,7 @@ Required properties:
                  at25df321a
                  at25df641
                  at26df081a
+                 mr25h128
                  mr25h256
                  mr25h10
                  mr25h40
drivers/mtd/devices/m25p80.c +1 -0
index 00eea6fd379c..dbe6a1de2bb8 100644
@@ -359,6 +359,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{"m25p32-nonjedec"},	{"m25p64-nonjedec"},	{"m25p128-nonjedec"},
 
 	/* Everspin MRAMs (non-JEDEC) */
+	{ "mr25h128" }, /* 128 Kib, 40 MHz */
 	{ "mr25h256" }, /* 256 Kib, 40 MHz */
 	{ "mr25h10" },  /*   1 Mib, 40 MHz */
 	{ "mr25h40" },  /*   4 Mib, 40 MHz */
drivers/mtd/spi-nor/spi-nor.c +1 -0
index 386de64e5a86..a835bb890166 100644
@@ -964,6 +964,7 @@ static const struct flash_info spi_nor_ids[] = {
 	{ "f25l64qa", INFO(0x8c4117, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_HAS_LOCK) },
 
 	/* Everspin */
+	{ "mr25h128", CAT25_INFO(16 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
 	{ "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) },
Signature · 1 line
2.15.0.rc1
#1 lore raw

Hi Philipp,

+ Marek

Please add spi-nor maintainers en CC when submitting spi-nor patches. Also always good to add [email protected] en CC when submitting patches.

Quoted 3 lines · Philipp Puschmann

Add Everspin mr25h128 16KB MRAM to the list of supported chips.

Applied to the spi-nor/next branch of l2-mtd with the tiny modification below:

Quoted 35 lines
---
 Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 1 +
 drivers/mtd/devices/m25p80.c                            | 1 +
 drivers/mtd/spi-nor/spi-nor.c                           | 1 +
 3 files changed, 3 insertions(+)
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +1 -0
index 9ce35af8507c..956bb046e599 100644
@@ -13,6 +13,7 @@ Required properties:
                  at25df321a
                  at25df641
                  at26df081a
+                 mr25h128
                  mr25h256
                  mr25h10
                  mr25h40
drivers/mtd/devices/m25p80.c +1 -0
index 00eea6fd379c..dbe6a1de2bb8 100644
@@ -359,6 +359,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{"m25p32-nonjedec"},	{"m25p64-nonjedec"},	{"m25p128-nonjedec"},
 
 	/* Everspin MRAMs (non-JEDEC) */
+	{ "mr25h128" }, /* 128 Kib, 40 MHz */
 	{ "mr25h256" }, /* 256 Kib, 40 MHz */
 	{ "mr25h10" },  /*   1 Mib, 40 MHz */
 	{ "mr25h40" },  /*   4 Mib, 40 MHz */
drivers/mtd/spi-nor/spi-nor.c +0 -0
index 386de64e5a86..a835bb890166 100644

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 968

Quoted 5 lines
drivers/mtd/spi-nor/spi-nor.c +1 -0
@@ -964,6 +964,7 @@ static const struct flash_info spi_nor_ids[] = {
 	{ "f25l64qa", INFO(0x8c4117, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_HAS_LOCK) },
 
 	/* Everspin */
+	{ "mr25h128", CAT25_INFO(16 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
 	{ "mr25h256", CAT25_INFO(32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

As explained in my reply to your other mail "mtd: spi-nor: fix style issue", I'd rather keep data aligned, so I kept the "mr25h256" entry as before and just add your "mr25h128" entry:

+ { "mr25h128", CAT25_INFO( 16 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
{ "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },

Quoted 3 lines
drivers/mtd/spi-nor/spi-nor.c +0 -0
 	{ "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) },