mtd: nand: Add support for EDO mode 1-5 to IMX6ULL platform

The clock driver allows to boost the NAND performance
controller. Make changes to let it use the new clock driver

=> time nand read ${loadaddr} kernel

NAND read: device 0 offset 0x500000, size 0x800000
 8388608 bytes read: OK

time: 0.488 seconds

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 80d9307cdd1fb0e3145de109217204f027f59d81..ba67466069bde6cebbbbe8951457d0f77d38b944 100644 (file)
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -1507,8 +1507,18 @@ static void mxs_compute_timings(struct nand_chip *chip,
        writel(GPMI_CTRL1_CLEAR_MASK, &nand_info->gpmi_regs->hw_gpmi_ctrl1_clr);
        writel(ctrl1n, &nand_info->gpmi_regs->hw_gpmi_ctrl1_set);
 
+       /* Clock dividers do NOT guarantee a clean clock signal on its output
+        * during the change of the divide factor on i.MX6Q/UL/SX. On i.MX7/8,
+        * all clock dividers provide these guarantee.
+        */
+       if (IS_ENABLED(CONFIG_MX6ULL))
+               clk_disable(nand_info->gpmi_clk);
+
        clk_set_rate(nand_info->gpmi_clk, clk_rate);
 
+       if (IS_ENABLED(CONFIG_MX6ULL))
+               clk_enable(nand_info->gpmi_clk);
+
        /* Wait 64 clock cycles before using the GPMI after enabling the DLL */
        dll_wait_time_us = USEC_PER_SEC / clk_rate * 64;
        if (!dll_wait_time_us)

diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c
index b62474bc5aba3e294d972a5f1040538c1c55d8dc..90eefa2558d9b5e5b7532f405416aac9486fa2fa 100644 (file)
--- a/drivers/mtd/nand/raw/mxs_nand_dt.c
+++ b/drivers/mtd/nand/raw/mxs_nand_dt.c
@@ -99,7 +99,7 @@ static int mxs_nand_dt_probe(struct udevice *dev)
        info->use_minimum_ecc = dev_read_bool(dev, "fsl,use-minimum-ecc");
 
        if (IS_ENABLED(CONFIG_CLK) &&
-           (IS_ENABLED(CONFIG_IMX8) || IS_ENABLED(CONFIG_IMX8M))) {
+           (IS_ENABLED(CONFIG_IMX8) || IS_ENABLED(CONFIG_IMX8M) || IS_ENABLED(CONFIG_MX6ULL))) {
                struct clk_bulk clk_bulk;
                info->gpmi_clk = devm_clk_get(dev, "gpmi_io");