126 lines
5.1 KiB
Diff
126 lines
5.1 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Tue, 30 Sep 2014 03:14:55 +0100
|
|
Subject: [4/4] mtd: m25p80,spi-nor: Fix module aliases for m25p80
|
|
Origin: http://git.infradead.org/l2-mtd.git/commit/a5b7616c55e188fe3d6ef686bef402d4703ecb62
|
|
|
|
m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The
|
|
MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but
|
|
its use was also removed at the same time. Now if m25p80 is built as
|
|
a module it doesn't get the necessary aliases to be loaded
|
|
automatically.
|
|
|
|
A clean solution to this will involve defining the list of device
|
|
IDs in spi-nor.h and removing struct spi_device_id from the spi-nor
|
|
API, but this is quite a large change.
|
|
|
|
As a quick fix suitable for stable, copy the device IDs back into
|
|
m25p80.
|
|
|
|
Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework")
|
|
Cc: <stable@vger.kernel.org> # 3.16.x: 32f1b7c8352f: mtd: move support for struct flash_platform_data into m25p80
|
|
Cc: <stable@vger.kernel.org> # 3.16.x: 90e55b3812a1: mtd: m25p80: get rid of spi_get_device_id
|
|
Cc: <stable@vger.kernel.org> # 3.16.x: 70f3ce0510af: mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
|
|
Cc: <stable@vger.kernel.org> # 3.16.x
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
drivers/mtd/devices/m25p80.c | 52 ++++++++++++++++++++++++++++++++++++++++++-
|
|
drivers/mtd/spi-nor/spi-nor.c | 3 +--
|
|
include/linux/mtd/spi-nor.h | 1 -
|
|
3 files changed, 52 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -261,12 +261,62 @@ static int m25p_remove(struct spi_device
|
|
}
|
|
|
|
|
|
+/*
|
|
+ * 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
|
|
+ * won't be able to read it and add appropriate aliases.
|
|
+ */
|
|
+static const struct spi_device_id m25p_ids[] = {
|
|
+ {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"},
|
|
+ {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"},
|
|
+ {"at26df321"}, {"at45db081d"},
|
|
+ {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"},
|
|
+ {"en25q64"}, {"en25qh128"}, {"en25qh256"},
|
|
+ {"f25l32pa"},
|
|
+ {"mr25h256"}, {"mr25h10"},
|
|
+ {"gd25q32"}, {"gd25q64"},
|
|
+ {"160s33b"}, {"320s33b"}, {"640s33b"},
|
|
+ {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"},
|
|
+ {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"},
|
|
+ {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"},
|
|
+ {"mx66l1g55g"},
|
|
+ {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"},
|
|
+ {"n25q512a"}, {"n25q512ax3"}, {"n25q00"},
|
|
+ {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"},
|
|
+ {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"},
|
|
+ {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"},
|
|
+ {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"},
|
|
+ {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"},
|
|
+ {"s25fl016k"}, {"s25fl064k"},
|
|
+ {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},
|
|
+ {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"},
|
|
+ {"sst25wf040"},
|
|
+ {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"},
|
|
+ {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"},
|
|
+ {"m25p128"}, {"n25q032"},
|
|
+ {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"},
|
|
+ {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"},
|
|
+ {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"},
|
|
+ {"m45pe10"}, {"m45pe80"}, {"m45pe16"},
|
|
+ {"m25pe20"}, {"m25pe80"}, {"m25pe16"},
|
|
+ {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"},
|
|
+ {"m25px64"},
|
|
+ {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"},
|
|
+ {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"},
|
|
+ {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"},
|
|
+ {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"},
|
|
+ {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"},
|
|
+ { },
|
|
+};
|
|
+MODULE_DEVICE_TABLE(spi, m25p_ids);
|
|
+
|
|
+
|
|
static struct spi_driver m25p80_driver = {
|
|
.driver = {
|
|
.name = "m25p80",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
- .id_table = spi_nor_ids,
|
|
+ .id_table = m25p_ids,
|
|
.probe = m25p_probe,
|
|
.remove = m25p_remove,
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -429,7 +429,7 @@ struct flash_info {
|
|
* more nor chips. This current list focusses on newer chips, which
|
|
* have been converging on command sets which including JEDEC ID.
|
|
*/
|
|
-const struct spi_device_id spi_nor_ids[] = {
|
|
+static const struct spi_device_id spi_nor_ids[] = {
|
|
/* Atmel -- some are (confusingly) marketed as "DataFlash" */
|
|
{ "at25fs010", INFO(0x1f6601, 0, 32 * 1024, 4, SECT_4K) },
|
|
{ "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8, SECT_4K) },
|
|
@@ -590,7 +590,6 @@ const struct spi_device_id spi_nor_ids[]
|
|
{ "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
|
|
{ },
|
|
};
|
|
-EXPORT_SYMBOL_GPL(spi_nor_ids);
|
|
|
|
static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor)
|
|
{
|
|
--- a/include/linux/mtd/spi-nor.h
|
|
+++ b/include/linux/mtd/spi-nor.h
|
|
@@ -195,6 +195,5 @@ struct spi_nor {
|
|
* Return: 0 for success, others for failure.
|
|
*/
|
|
int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode);
|
|
-extern const struct spi_device_id spi_nor_ids[];
|
|
|
|
#endif
|