163 lines
5.1 KiB
Diff
163 lines
5.1 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Mon, 29 Sep 2014 11:47:54 +0200
|
|
Subject: [3/4] mtd: spi-nor: make spi_nor_scan() take a chip type name, not
|
|
spi_device_id
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
Origin: http://git.infradead.org/l2-mtd.git/commit/70f3ce0510afdad7cbaf27ab7ab961377205c782
|
|
|
|
Drivers currently call spi_nor_match_id() and then spi_nor_scan().
|
|
This adds a dependency on struct spi_device_id which we want to
|
|
avoid. Make spi_nor_scan() do it for them.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
drivers/mtd/devices/m25p80.c | 4 +---
|
|
drivers/mtd/spi-nor/fsl-quadspi.c | 7 +------
|
|
drivers/mtd/spi-nor/spi-nor.c | 13 +++++++++----
|
|
include/linux/mtd/spi-nor.h | 20 +++-----------------
|
|
4 files changed, 14 insertions(+), 30 deletions(-)
|
|
|
|
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -193,7 +193,6 @@ static int m25p_probe(struct spi_device
|
|
{
|
|
struct mtd_part_parser_data ppdata;
|
|
struct flash_platform_data *data;
|
|
- const struct spi_device_id *id = NULL;
|
|
struct m25p *flash;
|
|
struct spi_nor *nor;
|
|
enum read_mode mode = SPI_NOR_NORMAL;
|
|
@@ -241,8 +240,7 @@ static int m25p_probe(struct spi_device
|
|
else
|
|
flash_name = spi->modalias;
|
|
|
|
- id = spi_nor_match_id(flash_name);
|
|
- ret = spi_nor_scan(nor, id, mode);
|
|
+ ret = spi_nor_scan(nor, flash_name, mode);
|
|
if (ret)
|
|
return ret;
|
|
|
|
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
|
|
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
|
|
@@ -881,7 +881,6 @@ static int fsl_qspi_probe(struct platfor
|
|
|
|
/* iterate the subnodes. */
|
|
for_each_available_child_of_node(dev->of_node, np) {
|
|
- const struct spi_device_id *id;
|
|
char modalias[40];
|
|
|
|
/* skip the holes */
|
|
@@ -909,10 +908,6 @@ static int fsl_qspi_probe(struct platfor
|
|
if (of_modalias_node(np, modalias, sizeof(modalias)) < 0)
|
|
goto map_failed;
|
|
|
|
- id = spi_nor_match_id(modalias);
|
|
- if (!id)
|
|
- goto map_failed;
|
|
-
|
|
ret = of_property_read_u32(np, "spi-max-frequency",
|
|
&q->clk_rate);
|
|
if (ret < 0)
|
|
@@ -921,7 +916,7 @@ static int fsl_qspi_probe(struct platfor
|
|
/* set the chip address for READID */
|
|
fsl_qspi_set_base_addr(q, nor);
|
|
|
|
- ret = spi_nor_scan(nor, id, SPI_NOR_QUAD);
|
|
+ ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD);
|
|
if (ret)
|
|
goto map_failed;
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -28,6 +28,8 @@
|
|
|
|
#define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16)
|
|
|
|
+static const struct spi_device_id *spi_nor_match_id(const char *name);
|
|
+
|
|
/*
|
|
* Read the status register, returning its value in the location
|
|
* Return the status register value.
|
|
@@ -867,9 +869,9 @@ static int spi_nor_check(struct spi_nor
|
|
return 0;
|
|
}
|
|
|
|
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
|
- enum read_mode mode)
|
|
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
|
|
{
|
|
+ const struct spi_device_id *id = NULL;
|
|
struct flash_info *info;
|
|
struct device *dev = nor->dev;
|
|
struct mtd_info *mtd = nor->mtd;
|
|
@@ -881,6 +883,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ id = spi_nor_match_id(name);
|
|
+ if (!id)
|
|
+ return -ENOENT;
|
|
+
|
|
info = (void *)id->driver_data;
|
|
|
|
if (info->jedec_id) {
|
|
@@ -1062,7 +1068,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
}
|
|
EXPORT_SYMBOL_GPL(spi_nor_scan);
|
|
|
|
-const struct spi_device_id *spi_nor_match_id(char *name)
|
|
+static const struct spi_device_id *spi_nor_match_id(const char *name)
|
|
{
|
|
const struct spi_device_id *id = spi_nor_ids;
|
|
|
|
@@ -1073,7 +1079,6 @@ const struct spi_device_id *spi_nor_matc
|
|
}
|
|
return NULL;
|
|
}
|
|
-EXPORT_SYMBOL_GPL(spi_nor_match_id);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>");
|
|
--- a/include/linux/mtd/spi-nor.h
|
|
+++ b/include/linux/mtd/spi-nor.h
|
|
@@ -183,32 +183,18 @@ struct spi_nor {
|
|
/**
|
|
* spi_nor_scan() - scan the SPI NOR
|
|
* @nor: the spi_nor structure
|
|
- * @id: the spi_device_id provided by the driver
|
|
+ * @name: the chip type name
|
|
* @mode: the read mode supported by the driver
|
|
*
|
|
* The drivers can use this fuction to scan the SPI NOR.
|
|
* In the scanning, it will try to get all the necessary information to
|
|
* fill the mtd_info{} and the spi_nor{}.
|
|
*
|
|
- * The board may assigns a spi_device_id with @id which be used to compared with
|
|
- * the spi_device_id detected by the scanning.
|
|
+ * The chip type name can be provided through the @name parameter.
|
|
*
|
|
* Return: 0 for success, others for failure.
|
|
*/
|
|
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
|
- enum read_mode mode);
|
|
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode);
|
|
extern const struct spi_device_id spi_nor_ids[];
|
|
|
|
-/**
|
|
- * spi_nor_match_id() - find the spi_device_id by the name
|
|
- * @name: the name of the spi_device_id
|
|
- *
|
|
- * The drivers use this function to find the spi_device_id
|
|
- * specified by the @name.
|
|
- *
|
|
- * Return: returns the right spi_device_id pointer on success,
|
|
- * and returns NULL on failure.
|
|
- */
|
|
-const struct spi_device_id *spi_nor_match_id(char *name);
|
|
-
|
|
#endif
|