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

Commit 3e38933d authored by Knut Wohlrab's avatar Knut Wohlrab Committed by Brian Norris
Browse files

mtd: m25p80: Add support for serial flash Spansion S25FL132K 



Signed-off-by: default avatarKnut Wohlrab <knut.wohlrab@de.bosch.com>
Signed-off-by: default avatarAlison Chaiken <alison_chaiken@mentor.com>
Reviewed-by: default avatarJagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 834b6865

drivers/mtd/devices/m25p80.c

+1 −3
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ static int m25p_remove(struct spi_device *spi) 
	return mtd_device_unregister(&flash->mtd);

}





/*

 * XXX This needs to be kept in sync with spi_nor_ids.  We can't share

 * it with spi-nor, because if this is built as a module then modpost
@@ -279,7 +278,7 @@ static const struct spi_device_id m25p_ids[] = { 
	{"s25fl512s"},	{"s70fl01gs"},	{"s25sl12800"},	{"s25sl12801"},

	{"s25fl129p0"},	{"s25fl129p1"},	{"s25sl004a"},	{"s25sl008a"},

	{"s25sl016a"},	{"s25sl032a"},	{"s25sl064a"},	{"s25fl008k"},

	{"s25fl016k"},	{"s25fl064k"},

	{"s25fl016k"},	{"s25fl064k"},	{"s25fl132k"},

	{"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},

	{"sst25vf064c"},{"sst25wf512"},	{"sst25wf010"},	{"sst25wf020"},

	{"sst25wf040"},
@@ -302,7 +301,6 @@ static const struct spi_device_id m25p_ids[] = { 
};

MODULE_DEVICE_TABLE(spi, m25p_ids);





static struct spi_driver m25p80_driver = {

	.driver = {

		.name	= "m25p80",

drivers/mtd/spi-nor/spi-nor.c

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ static const struct spi_device_id spi_nor_ids[] = { 
	{ "s25fl008k",  INFO(0xef4014,      0,  64 * 1024,  16, SECT_4K) },

	{ "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },

	{ "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },

	{ "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, 0) },



	/* SST -- large erase sizes are "overlays", "sectors" are 4K */

	{ "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K | SST_WRITE) },