From: Graham Moore Date: Thu, 24 Mar 2016 13:14:35 +0000 (+0900) Subject: mtd: nand: denali: max_banks calculation changed in revision 5.1 X-Git-Tag: v2016.05-rc1~118 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15305c2f0334c52d1afaed7cf7dcaa6944019f68;p=u-boot mtd: nand: denali: max_banks calculation changed in revision 5.1 Read Denali hardware revision number and use it to calculate max_banks, The encoding of max_banks changed in Denali revision 5.1. [ Linux commit : 271707b1d817f5104e02b2bd1bab43f0c8759418 ] Signed-off-by: Graham Moore [Brian: parentheses around macro arg] Signed-off-by: Brian Norris [Masahiro: import from Linux and adjust ioread32() to readl() ] Signed-off-by: Masahiro Yamada --- diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 018d14fc81..5894fcc4a8 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -431,7 +431,16 @@ static void find_valid_banks(struct denali_nand_info *denali) static void detect_max_banks(struct denali_nand_info *denali) { uint32_t features = readl(denali->flash_reg + FEATURES); - denali->max_banks = 2 << (features & FEATURES__N_BANKS); + /* + * Read the revision register, so we can calculate the max_banks + * properly: the encoding changed from rev 5.0 to 5.1 + */ + u32 revision = MAKE_COMPARABLE_REVISION( + readl(denali->flash_reg + REVISION)); + if (revision < REVISION_5_1) + denali->max_banks = 2 << (features & FEATURES__N_BANKS); + else + denali->max_banks = 1 << (features & FEATURES__N_BANKS); } static void detect_partition_feature(struct denali_nand_info *denali) diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index 93b57259d6..db1457a680 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -166,6 +166,8 @@ #define REVISION 0x370 #define REVISION__VALUE 0xffff +#define MAKE_COMPARABLE_REVISION(x) swab16((x) & REVISION__VALUE) +#define REVISION_5_1 0x00000501 #define ONFI_DEVICE_FEATURES 0x380 #define ONFI_DEVICE_FEATURES__VALUE 0x003f