mtd: rawnand: gpmi: add 'support_edo_timing' in gpmi_devdata

Introduce a boolean flag, 'support_edo_timing', within gpmi_devdata to
simplify the logic check in gpmi_setup_interface(). This is made in
preparation for adding support for imx8qxp gpmi.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240520-gpmi_nand-v2-3-e3017e4c9da5@nxp.com

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index e71ad2fcec2326dcc5cd93520e4dc54cd3a5133a..fbb1f243ef129f3bb989915b72831a0fcb690329 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -983,7 +983,7 @@ static int gpmi_setup_interface(struct nand_chip *chip, int chipnr,
                return PTR_ERR(sdr);
 
        /* Only MX28/MX6 GPMI controller can reach EDO timings */
-       if (sdr->tRC_min <= 25000 && !GPMI_IS_MX28(this) && !GPMI_IS_MX6(this))
+       if (sdr->tRC_min <= 25000 && !this->devdata->support_edo_timing)
                return -ENOTSUPP;
 
        /* Stop here if this call was just a check */
@@ -1142,6 +1142,7 @@ static const struct gpmi_devdata gpmi_devdata_imx28 = {
        .type = IS_MX28,
        .bch_max_ecc_strength = 20,
        .max_chain_delay = 16000,
+       .support_edo_timing = true,
        .clks = gpmi_clks_for_mx2x,
        .clks_count = ARRAY_SIZE(gpmi_clks_for_mx2x),
 };
@@ -1154,6 +1155,7 @@ static const struct gpmi_devdata gpmi_devdata_imx6q = {
        .type = IS_MX6Q,
        .bch_max_ecc_strength = 40,
        .max_chain_delay = 12000,
+       .support_edo_timing = true,
        .clks = gpmi_clks_for_mx6,
        .clks_count = ARRAY_SIZE(gpmi_clks_for_mx6),
 };
@@ -1162,6 +1164,7 @@ static const struct gpmi_devdata gpmi_devdata_imx6sx = {
        .type = IS_MX6SX,
        .bch_max_ecc_strength = 62,
        .max_chain_delay = 12000,
+       .support_edo_timing = true,
        .clks = gpmi_clks_for_mx6,
        .clks_count = ARRAY_SIZE(gpmi_clks_for_mx6),
 };
@@ -1174,6 +1177,7 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = {
        .type = IS_MX7D,
        .bch_max_ecc_strength = 62,
        .max_chain_delay = 12000,
+       .support_edo_timing = true,
        .clks = gpmi_clks_for_mx7d,
        .clks_count = ARRAY_SIZE(gpmi_clks_for_mx7d),
 };

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index c3ff56ac62a7ebb89e0d337480be571cc8ea31ac..c8a662a497b608a0f13ac096f7cd5c9d79358834 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -86,6 +86,7 @@ struct gpmi_devdata {
        int max_chain_delay; /* See the SDR EDO mode */
        const char * const *clks;
        const int clks_count;
+       bool support_edo_timing;
 };
 
 /**