Commit c9e02584 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon
Browse files

mtd: nand: denali: remove detect_partition_feature() 



The denali->fwblks is set by detect_partition_feature(), but it is
not referenced from anywhere.  That means the struct member fwblks
and the whole of detect_partition_feature() are unneeded.

The comment block implies this function is only for Intel platforms.
I found drivers/staging/spectra used to exist, but it was deleted by
commit be7f39c5 ("Staging: delete spectra driver") 5 years ago.

So, I guess nobody would need this function any more.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 50d5f2a0

drivers/mtd/nand/denali.c

+0 −29
Original line number Diff line number Diff line
@@ -473,33 +473,6 @@ static void detect_max_banks(struct denali_nand_info *denali) 
		denali->max_banks = 1 << (features & FEATURES__N_BANKS);

}



static void detect_partition_feature(struct denali_nand_info *denali)

{

	/*

	 * For MRST platform, denali->fwblks represent the

	 * number of blocks firmware is taken,

	 * FW is in protect partition and MTD driver has no

	 * permission to access it. So let driver know how many

	 * blocks it can't touch.

	 */

	if (ioread32(denali->flash_reg + FEATURES) & FEATURES__PARTITION) {

		if ((ioread32(denali->flash_reg + PERM_SRC_ID(1)) &

			PERM_SRC_ID__SRCID) == SPECTRA_PARTITION_ID) {

			denali->fwblks =

			    ((ioread32(denali->flash_reg + MIN_MAX_BANK(1)) &

			      MIN_MAX_BANK__MIN_VALUE) *

			     denali->blksperchip)

			    +

			    (ioread32(denali->flash_reg + MIN_BLK_ADDR(1)) &

			    MIN_BLK_ADDR__VALUE);

		} else {

			denali->fwblks = SPECTRA_START_BLOCK;

		}

	} else {

		denali->fwblks = SPECTRA_START_BLOCK;

	}

}



static uint16_t denali_nand_timing_set(struct denali_nand_info *denali)

{

	uint16_t status = PASS;
@@ -551,8 +524,6 @@ static uint16_t denali_nand_timing_set(struct denali_nand_info *denali) 


	find_valid_banks(denali);



	detect_partition_feature(denali);



	/*

	 * If the user specified to override the default timings

	 * with a specific ONFI mode, we apply those changes here.

drivers/mtd/nand/denali.h

+0 −9
Original line number Diff line number Diff line
@@ -383,14 +383,6 @@ 
#define CLK_X  5

#define CLK_MULTI 4



/* spectraswconfig.h */

#define CMD_DMA 0



#define SPECTRA_PARTITION_ID    0

/**** Block Table and Reserved Block Parameters *****/

#define SPECTRA_START_BLOCK     3

#define NUM_FREE_BLOCKS_GATE    30



/* KBV - Updated to LNW scratch register address */

#define SCRATCH_REG_ADDR    CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR

#define SCRATCH_REG_SIZE    64
@@ -470,7 +462,6 @@ struct denali_nand_info { 
	int irq;



	uint32_t devnum;	/* represent how many nands connected */

	uint32_t fwblks; /* represent how many blocks FW used */

	uint32_t totalblks;

	uint32_t blksperchip;

	uint32_t bbtskipbytes;