Unverified Commit 1ac71ec0 authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

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: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
parent 075fd6df

drivers/mtd/spi-nor/Kconfig

+2 −2
Original line number Diff line number Diff line 
# 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

drivers/mtd/spi-nor/controllers/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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)"

drivers/mtd/spi-nor/controllers/aspeed-smc.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/mtd/spi-nor/controllers/hisi-sfc.c

+1 −1
Original line number Diff line number Diff line 
// 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.

 */

drivers/mtd/spi-nor/controllers/nxp-spifi.c

+1 −1
Original line number Diff line number Diff line 
// 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>

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE