mtd: sh_flctl: Expand FLCMNCR register bit field

Add support for a new hardware generation. The meaning of some bits
of the FLCMNCR register changed, so some new defines are added
parallel to the existing ones to keep backward compatibility.

The defines allow to choose an appropriate clocking scheme.

Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 9cf4c4c7955509a98590df62e13dcb4f679ac346..b66940593c829f780831fa9785629e317d7138a8 100644 (file)
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -67,6 +67,30 @@
 #define        CE0_ENABLE      (0x1 << 3)      /* Chip Enable 0 */
 #define        TYPESEL_SET     (0x1 << 0)
 
+/*
+ * Clock settings using the PULSEx registers from FLCMNCR
+ *
+ * Some hardware uses bits called PULSEx instead of FCKSEL_E and QTSEL_E
+ * to control the clock divider used between the High-Speed Peripheral Clock
+ * and the FLCTL internal clock. If so, use CLK_8_BIT_xxx for connecting 8 bit
+ * and CLK_16_BIT_xxx for connecting 16 bit bus bandwith NAND chips. For the 16
+ * bit version the divider is seperate for the pulse width of high and low
+ * signals.
+ */
+#define PULSE3 (0x1 << 27)
+#define PULSE2 (0x1 << 17)
+#define PULSE1 (0x1 << 15)
+#define PULSE0 (0x1 << 9)
+#define CLK_8B_0_5                     PULSE1
+#define CLK_8B_1                       0x0
+#define CLK_8B_1_5                     (PULSE1 | PULSE2)
+#define CLK_8B_2                       PULSE0
+#define CLK_8B_3                       (PULSE0 | PULSE1 | PULSE2)
+#define CLK_8B_4                       (PULSE0 | PULSE2)
+#define CLK_16B_6L_2H                  PULSE0
+#define CLK_16B_9L_3H                  (PULSE0 | PULSE1 | PULSE2)
+#define CLK_16B_12L_4H                 (PULSE0 | PULSE2)
+
 /* FLCMDCR control bits */
 #define ADRCNT2_E      (0x1 << 31)     /* 5byte address enable */
 #define ADRMD_E                (0x1 << 26)     /* Sector address access */