Commit 7cf7d424 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd

Pull MTD fixes from Brian Norris:
 "Two MTD fixes for 4.1:

   - readtest: the signal-handling code was clobbering the error codes
     we should be handling/reporting in this test, rendering it useless.
     Noticed by Coverity.

   - the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
     revised, so let's change that before 4.1 is minted"

* tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd:
  Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
  mtd: readtest: don't clobber error reports
parents c0655fe9 8947e396
...@@ -8,8 +8,8 @@ Required properties: ...@@ -8,8 +8,8 @@ Required properties:
is not Linux-only, but in case of Linux, see the "m25p_ids" is not Linux-only, but in case of Linux, see the "m25p_ids"
table in drivers/mtd/devices/m25p80.c for the list of supported table in drivers/mtd/devices/m25p80.c for the list of supported
chips. chips.
Must also include "nor-jedec" for any SPI NOR flash that can be Must also include "jedec,spi-nor" for any SPI NOR flash that can
identified by the JEDEC READ ID opcode (0x9F). be identified by the JEDEC READ ID opcode (0x9F).
- reg : Chip-Select number - reg : Chip-Select number
- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at - spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at
...@@ -25,7 +25,7 @@ Example: ...@@ -25,7 +25,7 @@ Example:
flash: m25p80@0 { flash: m25p80@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "spansion,m25p80", "nor-jedec"; compatible = "spansion,m25p80", "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <40000000>; spi-max-frequency = <40000000>;
m25p,fast-read; m25p,fast-read;
......
...@@ -223,7 +223,7 @@ static int m25p_probe(struct spi_device *spi) ...@@ -223,7 +223,7 @@ static int m25p_probe(struct spi_device *spi)
*/ */
if (data && data->type) if (data && data->type)
flash_name = data->type; flash_name = data->type;
else if (!strcmp(spi->modalias, "nor-jedec")) else if (!strcmp(spi->modalias, "spi-nor"))
flash_name = NULL; /* auto-detect */ flash_name = NULL; /* auto-detect */
else else
flash_name = spi->modalias; flash_name = spi->modalias;
...@@ -255,7 +255,7 @@ static int m25p_remove(struct spi_device *spi) ...@@ -255,7 +255,7 @@ static int m25p_remove(struct spi_device *spi)
* since most of these flash are compatible to some extent, and their * since most of these flash are compatible to some extent, and their
* differences can often be differentiated by the JEDEC read-ID command, we * differences can often be differentiated by the JEDEC read-ID command, we
* encourage new users to add support to the spi-nor library, and simply bind * encourage new users to add support to the spi-nor library, and simply bind
* against a generic string here (e.g., "nor-jedec"). * against a generic string here (e.g., "jedec,spi-nor").
* *
* Many flash names are kept here in this list (as well as in spi-nor.c) to * Many flash names are kept here in this list (as well as in spi-nor.c) to
* keep them available as module aliases for existing platforms. * keep them available as module aliases for existing platforms.
...@@ -305,7 +305,7 @@ static const struct spi_device_id m25p_ids[] = { ...@@ -305,7 +305,7 @@ static const struct spi_device_id m25p_ids[] = {
* Generic support for SPI NOR that can be identified by the JEDEC READ * Generic support for SPI NOR that can be identified by the JEDEC READ
* ID opcode (0x9F). Use this, if possible. * ID opcode (0x9F). Use this, if possible.
*/ */
{"nor-jedec"}, {"spi-nor"},
{ }, { },
}; };
MODULE_DEVICE_TABLE(spi, m25p_ids); MODULE_DEVICE_TABLE(spi, m25p_ids);
......
...@@ -191,9 +191,11 @@ static int __init mtd_readtest_init(void) ...@@ -191,9 +191,11 @@ static int __init mtd_readtest_init(void)
err = ret; err = ret;
} }
err = mtdtest_relax(); ret = mtdtest_relax();
if (err) if (ret) {
err = ret;
goto out; goto out;
}
} }
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment