Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"

In commit 8ff16cf77ce3 ("Documentation: devicetree: m25p80: add "nor-jedec"
binding"), we added a generic "nor-jedec" binding to catch all
mostly-compatible SPI NOR flash which can be detected via the READ ID
opcode (0x9F). This was discussed and reviewed at the time, however
objections have come up since then as part of this discussion:

http://lkml.kernel.org/g/20150511224646.GJ32500@ld-irv-0074

It seems the parties involved agree that "jedec,spi-nor" does a better
job of capturing the fact that this is SPI-specific, not just any NOR
flash.

This binding was only merged for v4.1-rc1, so it's still OK to change
the naming.

At the same time, let's move the documentation to a better name.

Next up: stop referring to code (drivers/mtd/devices/m25p80.c) from the
documentation.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: devicetree@vger.kernel.org
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Mark Rutland <mark.rutland@arm.com>

Changed files
+6 -6
Documentation
devicetree
bindings
drivers
mtd
devices
+3 -3
Documentation/devicetree/bindings/mtd/m25p80.txt Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
··· 8 8 is not Linux-only, but in case of Linux, see the "m25p_ids" 9 9 table in drivers/mtd/devices/m25p80.c for the list of supported 10 10 chips. 11 - Must also include "nor-jedec" for any SPI NOR flash that can be 12 - identified by the JEDEC READ ID opcode (0x9F). 11 + Must also include "jedec,spi-nor" for any SPI NOR flash that can 12 + be identified by the JEDEC READ ID opcode (0x9F). 13 13 - reg : Chip-Select number 14 14 - spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at 15 15 ··· 25 25 flash: m25p80@0 { 26 26 #address-cells = <1>; 27 27 #size-cells = <1>; 28 - compatible = "spansion,m25p80", "nor-jedec"; 28 + compatible = "spansion,m25p80", "jedec,spi-nor"; 29 29 reg = <0>; 30 30 spi-max-frequency = <40000000>; 31 31 m25p,fast-read;
+3 -3
drivers/mtd/devices/m25p80.c
··· 223 223 */ 224 224 if (data && data->type) 225 225 flash_name = data->type; 226 - else if (!strcmp(spi->modalias, "nor-jedec")) 226 + else if (!strcmp(spi->modalias, "spi-nor")) 227 227 flash_name = NULL; /* auto-detect */ 228 228 else 229 229 flash_name = spi->modalias; ··· 255 255 * since most of these flash are compatible to some extent, and their 256 256 * differences can often be differentiated by the JEDEC read-ID command, we 257 257 * encourage new users to add support to the spi-nor library, and simply bind 258 - * against a generic string here (e.g., "nor-jedec"). 258 + * against a generic string here (e.g., "jedec,spi-nor"). 259 259 * 260 260 * Many flash names are kept here in this list (as well as in spi-nor.c) to 261 261 * keep them available as module aliases for existing platforms. ··· 305 305 * Generic support for SPI NOR that can be identified by the JEDEC READ 306 306 * ID opcode (0x9F). Use this, if possible. 307 307 */ 308 - {"nor-jedec"}, 308 + {"spi-nor"}, 309 309 { }, 310 310 }; 311 311 MODULE_DEVICE_TABLE(spi, m25p_ids);