1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7c8b1694a134..3af137f49ac9 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -223,7 +223,7 @@ static int m25p_probe(struct spi_device *spi)
          */
         if (data && 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 */
         else
                 flash_name = spi->modalias;
@@ -255,7 +255,7 @@ static int m25p_remove(struct spi_device *spi)
  * since most of these flash are compatible to some extent, and their
  * 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
- * 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
  * keep them available as module aliases for existing platforms.
@@ -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
          * ID opcode (0x9F). Use this, if possible.
          */
-        {"nor-jedec"},
+        {"spi-nor"},
         { },
 };
 MODULE_DEVICE_TABLE(spi, m25p_ids);