diff options
author | Frieder Schrempf <frieder.schrempf@exceet.de> | 2018-08-02 14:53:54 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-02 15:35:42 +0100 |
commit | b02b17f55b2e789b9747cf4dd2eaaa110439a4cc (patch) | |
tree | d60141e155a240078ad763460a6b5637be03749f | |
parent | 5d27a9c8ea9e967d00b92a76d4bb242bf7692f2b (diff) | |
download | linux-b02b17f55b2e789b9747cf4dd2eaaa110439a4cc.tar.bz2 |
mtd: m25p80: Call spi_mem_get_name() to let controller set a custom name
By calling spi_mem_get_name(), the driver of the (Q)SPI controller can
set a custom name for the memory device if necessary.
This is useful to keep mtdparts compatible when controller drivers are
ported from the MTD to the SPI layer.
Suggested-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Frieder Schrempf <frieder.schrempf@exceet.de>
Acked-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index e84563d2067f..aac488008216 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -202,6 +202,9 @@ static int m25p_probe(struct spi_mem *spimem) if (data && data->name) nor->mtd.name = data->name; + if (!nor->mtd.name) + nor->mtd.name = spi_mem_get_name(spimem); + /* For some (historical?) reason many platforms provide two different * names in flash_platform_data: "name" and "type". Quite often name is * set to "m25p80" and then "type" provides a real chip name. |