Commit 1debdb96 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Boris Brezillon
Browse files

mtd: nand: fsmc: remove default timings 



When timings are no longer provided by the Device Tree, we now use the
SDR timings specified by the NAND flash, and such SDR timings are always
provided. Therefore, it is no longer necessary to keep "default" timings
in the fmsc driver.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent d9fb0795

drivers/mtd/nand/fsmc_nand.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -303,26 +303,12 @@ static void fsmc_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) 
 * FSMC registers

 * FSMC registers

 */

 */

static void fsmc_nand_setup(struct fsmc_nand_data *host,

static void fsmc_nand_setup(struct fsmc_nand_data *host,

			    struct fsmc_nand_timings *timings)

			    struct fsmc_nand_timings *tims)

{

{

	uint32_t value = FSMC_DEVTYPE_NAND | FSMC_ENABLE | FSMC_WAITON;

	uint32_t value = FSMC_DEVTYPE_NAND | FSMC_ENABLE | FSMC_WAITON;

	uint32_t tclr, tar, thiz, thold, twait, tset;

	uint32_t tclr, tar, thiz, thold, twait, tset;

	unsigned int bank = host->bank;

	unsigned int bank = host->bank;

	void __iomem *regs = host->regs_va;

	void __iomem *regs = host->regs_va;

	struct fsmc_nand_timings *tims;

	struct fsmc_nand_timings default_timings = {

		.tclr	= FSMC_TCLR_1,

		.tar	= FSMC_TAR_1,

		.thiz	= FSMC_THIZ_1,

		.thold	= FSMC_THOLD_4,

		.twait	= FSMC_TWAIT_6,

		.tset	= FSMC_TSET_0,

	};



	if (timings)

		tims = host->dev_timings;

	else

		tims = &default_timings;





	tclr = (tims->tclr & FSMC_TCLR_MASK) << FSMC_TCLR_SHIFT;

	tclr = (tims->tclr & FSMC_TCLR_MASK) << FSMC_TCLR_SHIFT;

	tar = (tims->tar & FSMC_TAR_MASK) << FSMC_TAR_SHIFT;

	tar = (tims->tar & FSMC_TAR_MASK) << FSMC_TAR_SHIFT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE