Commit bc27ede3 authored by Jamie Iles's avatar Jamie Iles Committed by Artem Bityutskiy
Browse files

mtd: denali: detect the number of banks before resetting NAND 



Commit c89eeda8 (mtd: denali: detect the
number of banks) introduced runtime detection of the number of banks.

However, denali_nand_reset() uses uses denanli_nand_info::max_banks so
we need to detect the maximum number of banks before doing the reset.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 0dc8626a

drivers/mtd/nand/denali.c

+1 −1
Original line number Diff line number Diff line
@@ -1346,6 +1346,7 @@ static void denali_hw_init(struct denali_nand_info *denali) 
	 * */

	denali->bbtskipbytes = ioread32(denali->flash_reg +

						SPARE_AREA_SKIP_BYTES);

	detect_max_banks(denali);

	denali_nand_reset(denali);

	iowrite32(0x0F, denali->flash_reg + RB_PIN_ENABLED);

	iowrite32(CHIP_EN_DONT_CARE__FLAG,
@@ -1356,7 +1357,6 @@ static void denali_hw_init(struct denali_nand_info *denali) 
	/* Should set value for these registers when init */

	iowrite32(0, denali->flash_reg + TWO_ROW_ADDR_CYCLES);

	iowrite32(1, denali->flash_reg + ECC_ENABLE);

	detect_max_banks(denali);

	denali_nand_timing_set(denali);

	denali_irq_init(denali);

}