From 0cbb2155193ae04b4b9be501d22339ab80c03fee Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Mon, 24 Jun 2013 14:08:42 +0200 Subject: [PATCH] nand_base: fix chipsize for multi LUN nands Chipsize didn't take number of LUNs into account. Sync chipsize calculation to kernel commit 63795755 Tested with MT29F8G16ADBDAH4 on OMAP4 Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer --- drivers/mtd/nand/nand_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 8c14112fe..1969afff1 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1117,7 +1117,8 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, mtd->writesize = le32_to_cpu(p->byte_per_page); mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize; mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page); - chip->chipsize = (uint64_t)le32_to_cpu(p->blocks_per_lun) * mtd->erasesize; + chip->chipsize = le32_to_cpu(p->blocks_per_lun); + chip->chipsize *= (uint64_t)mtd->erasesize * p->lun_count; *busw = 0; if (le16_to_cpu(p->features) & 1) *busw = NAND_BUSWIDTH_16;