From c807ca798fb8d7a3e0b651484007d56645483252 Mon Sep 17 00:00:00 2001 From: Pradeep P V K Date: Tue, 9 Jun 2020 19:10:40 +0530 Subject: [PATCH] mtd: msm_qpic_nand: Add a check to read an ONFI parameter page Add support to read an ONFI parameter page from the device on QPIC 2.0 controllers. Change-Id: I30e8696c17733dc745c6857c0dcb436764f229e2 Signed-off-by: Pradeep P V K --- drivers/mtd/devices/msm_qpic_nand.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/devices/msm_qpic_nand.c b/drivers/mtd/devices/msm_qpic_nand.c index 3b400f03805e..6fc4eaf843f9 100644 --- a/drivers/mtd/devices/msm_qpic_nand.c +++ b/drivers/mtd/devices/msm_qpic_nand.c @@ -611,10 +611,12 @@ static int msm_nand_flash_onfi_probe(struct msm_nand_info *info) struct version nandc_version = {0}; ret = msm_nand_version_check(info, &nandc_version); - if (!ret && !(nandc_version.nand_major == 1 && + if (!ret && !((nandc_version.nand_major == 1 && nandc_version.nand_minor >= 5 && nandc_version.qpic_major == 1 && - nandc_version.qpic_minor >= 5)) { + nandc_version.qpic_minor >= 5) || + (nandc_version.nand_major >= 2 && + nandc_version.qpic_major >= 2))) { ret = -EPERM; goto out; }