Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter

Browse Source 
First, fixups might want to replace the n_banks parameter, thus we need
it in the (writable) parameter struct. Secondly, this way we can have a
default in the core and just skip setting the n_banks in the flash_info
database. Most of the flashes doesn't have more than one bank.

Signed-off-by: Michael Walle <mwalle@kernel.org>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-7-e60548861b10@kernel.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
This commit is contained in:
Michael Walle 2023-09-08 12:16:25 +02:00 committed by Tudor Ambarus
parent d0cfd228b3
commit 9983e6da91
No known key found for this signature in database
GPG Key ID: 4B554F47A58D14E9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/spi-nor/core.c
View File

@ -2862,7 +2862,7 @@ static void spi_nor_init_flags(struct spi_nor *nor)
if (flags & NO_CHIP_ERASE) if (flags & NO_CHIP_ERASE)
nor->flags |= SNOR_F_NO_OP_CHIP_ERASE; nor->flags |= SNOR_F_NO_OP_CHIP_ERASE;
if (flags & SPI_NOR_RWW && nor->info->n_banks > 1 && if (flags & SPI_NOR_RWW && nor->params->n_banks > 1 &&
!nor->controller_ops) !nor->controller_ops)
nor->flags |= SNOR_F_RWW; nor->flags |= SNOR_F_RWW;
} }
@ -2926,8 +2926,8 @@ static int spi_nor_late_init_params(struct spi_nor *nor)
if (nor->flags & SNOR_F_HAS_LOCK && !nor->params->locking_ops) if (nor->flags & SNOR_F_HAS_LOCK && !nor->params->locking_ops)
spi_nor_init_default_locking_ops(nor); spi_nor_init_default_locking_ops(nor);
if (nor->info->n_banks > 1) if (params->n_banks > 1)
params->bank_size = div64_u64(params->size, nor->info->n_banks); params->bank_size = div64_u64(params->size, params->n_banks);
return 0; return 0;
} }
@ -2997,6 +2997,7 @@ static void spi_nor_init_default_params(struct spi_nor *nor)
params->size = info->size; params->size = info->size;
params->bank_size = params->size; params->bank_size = params->size;
params->page_size = info->page_size ?: SPI_NOR_DEFAULT_PAGE_SIZE; params->page_size = info->page_size ?: SPI_NOR_DEFAULT_PAGE_SIZE;
params->n_banks = info->n_banks;
if (!(info->flags & SPI_NOR_NO_FR)) { if (!(info->flags & SPI_NOR_NO_FR)) {
/* Default to Fast Read for DT and non-DT platform devices. */ /* Default to Fast Read for DT and non-DT platform devices. */

2
drivers/mtd/spi-nor/core.h
View File

@ -358,6 +358,7 @@ struct spi_nor_otp {
* in octal DTR mode. * in octal DTR mode.
* @rdsr_addr_nbytes: dummy address bytes needed for Read Status Register * @rdsr_addr_nbytes: dummy address bytes needed for Read Status Register
* command in octal DTR mode. * command in octal DTR mode.
* @n_banks: number of banks.
* @n_dice: number of dice in the flash memory. * @n_dice: number of dice in the flash memory.
* @vreg_offset: volatile register offset for each die. * @vreg_offset: volatile register offset for each die.
* @hwcaps: describes the read and page program hardware * @hwcaps: describes the read and page program hardware
@ -394,6 +395,7 @@ struct spi_nor_flash_parameter {
u8 addr_mode_nbytes; u8 addr_mode_nbytes;
u8 rdsr_dummy; u8 rdsr_dummy;
u8 rdsr_addr_nbytes; u8 rdsr_addr_nbytes;
u8 n_banks;
u8 n_dice; u8 n_dice;
u32 *vreg_offset; u32 *vreg_offset;