ENGR00323263 support accessing two QSPI chips simultaneously

Add mutex on QSPI controller layer to support accessing two QSPI chips
simultaneously.

removed the conflict ddr_io_mode, it's already obsoleted in community
code.

Signed-off-by: Allen Xu <b45815@freescale.com>

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 6afa9064ad04a523e3b4f0f09298edff14c620cc..99e95c8618e20b2c2aafcb336ac7cb42ceaefe31 100644 (file)
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -26,6 +26,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/spi-nor.h>
+#include <linux/mutex.h>
 
 /* The registers */
 #define QUADSPI_MCR                    0x00
@@ -235,6 +236,7 @@ struct fsl_qspi {
        u32 nor_num;
        u32 clk_rate;
        unsigned int chip_base_addr; /* We may support two chips. */
+       struct mutex lock;
 };
 
 static inline int is_vybrid_qspi(struct fsl_qspi *q)
@@ -824,6 +826,8 @@ static int fsl_qspi_prep(struct spi_nor *nor, enum spi_nor_ops ops)
        struct fsl_qspi *q = nor->priv;
        int ret;
 
+       mutex_lock(&q->lock);
+
        ret = clk_enable(q->clk_en);
        if (ret)
                return ret;
@@ -844,6 +848,7 @@ static void fsl_qspi_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
 
        clk_disable(q->clk);
        clk_disable(q->clk_en);
+       mutex_unlock(&q->lock);
 }
 
 static int fsl_qspi_probe(struct platform_device *pdev)
@@ -936,6 +941,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
        if (of_get_property(np, "fsl,qspi-has-second-chip", NULL))
                has_second_chip = true;
 
+       mutex_init(&q->lock);
+
        /* iterate the subnodes. */
        for_each_available_child_of_node(dev->of_node, np) {
                const struct spi_device_id *id;