mtd: spi-nor: fsl-quadspi: use quirk to distinguish different qspi version

add several quirk to distinguish different version of qspi module.

Signed-off-by: Han Xu <han.xu@freescale.com>
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 2d460368ce5fd484d2fd954f6d4c90e06a6f6dea..91bfeac7972270a0506830a663d2986c0e63ec84 100644 (file)
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -28,6 +28,11 @@
 #include <linux/mtd/spi-nor.h>
 #include <linux/mutex.h>
 
+/* Controller needs driver to swap endian */
+#define QUADSPI_QUIRK_SWAP_ENDIAN      (1 << 0)
+/* Controller needs 4x internal clock */
+#define QUADSPI_QUIRK_4X_INT_CLK       (1 << 1)
+
 /* The registers */
 #define QUADSPI_MCR                    0x00
 #define QUADSPI_MCR_RESERVED_SHIFT     16
@@ -204,20 +209,23 @@ struct fsl_qspi_devtype_data {
        int rxfifo;
        int txfifo;
        int ahb_buf_size;
+       int driver_data;
 };
 
 static struct fsl_qspi_devtype_data vybrid_data = {
        .devtype = FSL_QUADSPI_VYBRID,
        .rxfifo = 128,
        .txfifo = 64,
-       .ahb_buf_size = 1024
+       .ahb_buf_size = 1024,
+       .driver_data = QUADSPI_QUIRK_SWAP_ENDIAN,
 };
 
 static struct fsl_qspi_devtype_data imx6sx_data = {
        .devtype = FSL_QUADSPI_IMX6SX,
        .rxfifo = 128,
        .txfifo = 512,
-       .ahb_buf_size = 1024
+       .ahb_buf_size = 1024,
+       .driver_data = QUADSPI_QUIRK_4X_INT_CLK,
 };
 
 #define FSL_QSPI_MAX_CHIP      4
@@ -241,14 +249,14 @@ struct fsl_qspi {
        struct mutex lock;
 };
 
-static inline int is_vybrid_qspi(struct fsl_qspi *q)
+static inline int needs_swap_endian(struct fsl_qspi *q)
 {
-       return q->devtype_data->devtype == FSL_QUADSPI_VYBRID;
+       return q->devtype_data->driver_data & QUADSPI_QUIRK_SWAP_ENDIAN;
 }
 
-static inline int is_imx6sx_qspi(struct fsl_qspi *q)
+static inline int needs_4x_clock(struct fsl_qspi *q)
 {
-       return q->devtype_data->devtype == FSL_QUADSPI_IMX6SX;
+       return q->devtype_data->driver_data & QUADSPI_QUIRK_4X_INT_CLK;
 }
 
 /*
@@ -257,7 +265,7 @@ static inline int is_imx6sx_qspi(struct fsl_qspi *q)
  */
 static inline u32 fsl_qspi_endian_xchg(struct fsl_qspi *q, u32 a)
 {
-       return is_vybrid_qspi(q) ? __swab32(a) : a;
+       return needs_swap_endian(q) ? __swab32(a) : a;
 }
 
 static inline void fsl_qspi_unlock_lut(struct fsl_qspi *q)
@@ -652,7 +660,7 @@ static int fsl_qspi_nor_setup_last(struct fsl_qspi *q)
        unsigned long rate = q->clk_rate;
        int ret;
 
-       if (is_imx6sx_qspi(q))
+       if (needs_4x_clock(q))
                rate *= 4;
 
        ret = clk_set_rate(q->clk, rate);