mtd: spi-nor: Fix SPI NOR acronym

The correct terminology is serial NOR flash or SPI NOR.
s/SPI-NOR/SPI NOR and s/spi-nor/SPI NOR across the subsystem.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig
index 6e816eafb312a6af0446e156aae7cebe32ebf3a4..ffc4b380f2b16df19fb266b2ffd947b984621b78 100644 (file)
--- a/drivers/mtd/spi-nor/Kconfig
+++ b/drivers/mtd/spi-nor/Kconfig
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menuconfig MTD_SPI_NOR
-       tristate "SPI-NOR device support"
+       tristate "SPI NOR device support"
        depends on MTD
        depends on MTD && SPI_MASTER
        select SPI_MEM
        help
          This is the framework for the SPI NOR which can be used by the SPI
-         device drivers and the SPI-NOR device driver.
+         device drivers and the SPI NOR device driver.
 
 if MTD_SPI_NOR
 

diff --git a/drivers/mtd/spi-nor/controllers/Kconfig b/drivers/mtd/spi-nor/controllers/Kconfig
index 10b86660b82144c078911663ebef01ab64816d18..d89a5ea9446a1c7e626596037cd28112d76c076d 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/Kconfig
+++ b/drivers/mtd/spi-nor/controllers/Kconfig
@@ -21,11 +21,11 @@ config SPI_CADENCE_QUADSPI
          Flash as an MTD device.
 
 config SPI_HISI_SFC
-       tristate "Hisilicon FMC SPI-NOR Flash Controller(SFC)"
+       tristate "Hisilicon FMC SPI NOR Flash Controller(SFC)"
        depends on ARCH_HISI || COMPILE_TEST
        depends on HAS_IOMEM
        help
-         This enables support for HiSilicon FMC SPI-NOR flash controller.
+         This enables support for HiSilicon FMC SPI NOR flash controller.
 
 config SPI_NXP_SPIFI
        tristate "NXP SPI Flash Interface (SPIFI)"

diff --git a/drivers/mtd/spi-nor/controllers/aspeed-smc.c b/drivers/mtd/spi-nor/controllers/aspeed-smc.c
index ae85e4c0e114386154ebebce477340644bd31e33..7225870e8b18cd666ae0a7d5b64ade7fde25c143 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/aspeed-smc.c
+++ b/drivers/mtd/spi-nor/controllers/aspeed-smc.c
@@ -727,7 +727,7 @@ static int aspeed_smc_chip_setup_finish(struct aspeed_smc_chip *chip)
 
        /*
         * TODO: Adjust clocks if fast read is supported and interpret
-        * SPI-NOR flags to adjust controller settings.
+        * SPI NOR flags to adjust controller settings.
         */
        if (chip->nor.read_proto == SNOR_PROTO_1_1_1) {
                if (chip->nor.read_dummy == 0)

diff --git a/drivers/mtd/spi-nor/controllers/hisi-sfc.c b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
index 6c7a4118752eac4178a1470a52ec43c5463e943d..95c502173cbdaf7f743fc3aa0000132540b1a9c1 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/hisi-sfc.c
+++ b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * HiSilicon FMC SPI-NOR flash controller driver
+ * HiSilicon FMC SPI NOR flash controller driver
  *
  * Copyright (c) 2015-2016 HiSilicon Technologies Co., Ltd.
  */

diff --git a/drivers/mtd/spi-nor/controllers/nxp-spifi.c b/drivers/mtd/spi-nor/controllers/nxp-spifi.c
index 9a5b1a7c636a027f11963d47633d216ef646ad37..5703e831398030af0f8c726022d9ff99af706b84 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/nxp-spifi.c
+++ b/drivers/mtd/spi-nor/controllers/nxp-spifi.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * SPI-NOR driver for NXP SPI Flash Interface (SPIFI)
+ * SPI NOR driver for NXP SPI Flash Interface (SPIFI)
  *
  * Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com>
  *

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 1ab4386a099a9b07565b5e0133cb2fb12945b5fb..0369d98b2d12efe0757196ee651a6e107f1cbeba 100644 (file)
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2469,7 +2469,7 @@ static int spi_nor_select_read(struct spi_nor *nor,
        nor->read_proto = read->proto;
 
        /*
-        * In the spi-nor framework, we don't need to make the difference
+        * In the SPI NOR framework, we don't need to make the difference
         * between mode clock cycles and wait state clock cycles.
         * Indeed, the value of the mode clock cycles is used by a QSPI
         * flash memory to know whether it should enter or leave its 0-4-4
@@ -3126,7 +3126,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
        /*
         * Make sure the XSR_RDY flag is set before calling
         * spi_nor_wait_till_ready(). Xilinx S3AN share MFR
-        * with Atmel spi-nor
+        * with Atmel SPI NOR.
         */
        if (info->flags & SPI_NOR_XSR_RDY)
                nor->flags |=  SNOR_F_READY_XSR_RDY;

diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index bebff2729c1898781348cfef5231127f22ee29d7..60bac2c0ec456f32c7ab6cbea727b5ed729f1b3d 100644 (file)
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -302,7 +302,7 @@ struct spi_nor;
  * @read:              read data from the SPI NOR.
  * @write:             write data to the SPI NOR.
  * @erase:             erase a sector of the SPI NOR at the offset @offs; if
- *                     not provided by the driver, spi-nor will send the erase
+ *                     not provided by the driver, SPI NOR will send the erase
  *                     opcode via write_reg().
  */
 struct spi_nor_controller_ops {
@@ -336,7 +336,7 @@ struct spi_nor_flash_parameter;
  *                      layer is not DMA-able
  * @bouncebuf_size:    size of the bounce buffer
  * @info:              SPI NOR part JEDEC MFR ID and other info
- * @manufacturer:      spi-nor manufacturer
+ * @manufacturer:      SPI NOR manufacturer
  * @page_size:         the page size of the SPI NOR
  * @addr_width:                number of address bytes
  * @erase_opcode:      the opcode for erasing a sector
@@ -344,12 +344,12 @@ struct spi_nor_flash_parameter;
  * @read_dummy:                the dummy needed by the read operation
  * @program_opcode:    the program opcode
  * @sst_write_second:  used by the SST write operation
- * @flags:             flag options for the current SPI-NOR (SNOR_F_*)
+ * @flags:             flag options for the current SPI NOR (SNOR_F_*)
  * @read_proto:                the SPI protocol for read operations
  * @write_proto:       the SPI protocol for write operations
  * @reg_proto:         the SPI protocol for read_reg/write_reg/erase operations
  * @controller_ops:    SPI NOR controller driver specific operations.
- * @params:            [FLASH-SPECIFIC] SPI-NOR flash parameters and settings.
+ * @params:            [FLASH-SPECIFIC] SPI NOR flash parameters and settings.
  *                      The structure includes legacy flash parameters and
  *                      settings that can be overwritten by the spi_nor_fixups
  *                      hooks, or dynamically when parsing the SFDP tables.