mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 21:44:06 +08:00
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>
This commit is contained in:
parent
075fd6dff2
commit
1ac71ec013
@ -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
|
||||
|
||||
|
@ -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)"
|
||||
|
@ -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)
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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>
|
||||
*
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user