ARM: OMAP: omap2/gpmc updates

GPMC updates:
 - bugfixes: wrong/missing flags, omitted write, wrong test
 - don't map memory segments starting at zero
 - improve debug messaging
 - export gpmc_get_fclk_perio]d() since it's needed to calc timings
 - expect gpmc_cs_set_timings() caller to have initialized sync vs async

Note that this API is glitchy; likely the best fix would be to add
a member to "struct gpmc_timings" to hold GPMC_CONFIG1, since that
holds one key aspect of the GPMC timings (the gpmc_fclk divisor,
and sync vs. async == whether that divisor matters).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

2 files changed, 24 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index e290b989aa94..6d6b25c46b1f 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -88,7 +88,7 @@ u32 gpmc_cs_read_reg(int cs, int idx)
 }
 
 /* TODO: Add support for gpmc_fck to clock framework and use it */
-static unsigned long gpmc_get_fclk_period(void)
+unsigned long gpmc_get_fclk_period(void)
 {
         /* In picoseconds */
         return 1000000000 / ((clk_get_rate(gpmc_l3_clk)) / 1000);
@@ -120,15 +120,21 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
         else
                 ticks = gpmc_ns_to_ticks(time);
         nr_bits = end_bit - st_bit + 1;
-        if (ticks >= 1 << nr_bits)
+        if (ticks >= 1 << nr_bits) {
+#ifdef DEBUG
+                printk(KERN_INFO "GPMC CS%d: %-10s* %3d ns, %3d ticks >= %d\n",
+                                cs, name, time, ticks, 1 << nr_bits);
+#endif
                 return -1;
+        }
 
         mask = (1 << nr_bits) - 1;
         l = gpmc_cs_read_reg(cs, reg);
 #ifdef DEBUG
-        printk(KERN_INFO "GPMC CS%d: %-10s: %d ticks, %3lu ns (was %i ticks)\n",
+        printk(KERN_INFO
+                "GPMC CS%d: %-10s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n",
                cs, name, ticks, gpmc_get_fclk_period() * ticks / 1000,
-               (l >> st_bit) & mask);
+                        (l >> st_bit) & mask, time);
 #endif
         l &= ~(mask << st_bit);
         l |= ticks << st_bit;
@@ -157,7 +163,7 @@ int gpmc_cs_calc_divider(int cs, unsigned int sync_clk)
         div = l / gpmc_get_fclk_period();
         if (div > 4)
                 return -1;
-        if (div < 0)
+        if (div <= 0)
                 div = 1;
 
         return div;
@@ -191,14 +197,19 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
 
         GPMC_SET_ONE(GPMC_CS_CONFIG5, 24, 27, page_burst_access);
 
+        /* caller is expected to have initialized CONFIG1 to cover
+         * at least sync vs async
+         */
+        l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+        if (l & (GPMC_CONFIG1_READTYPE_SYNC | GPMC_CONFIG1_WRITETYPE_SYNC)) {
 #ifdef DEBUG
-        printk(KERN_INFO "GPMC CS%d CLK period is %lu (div %d)\n",
-               cs, gpmc_get_fclk_period(), div);
+                printk(KERN_INFO "GPMC CS%d CLK period is %lu ns (div %d)\n",
+                                cs, (div * gpmc_get_fclk_period()) / 1000, div);
 #endif
-
-        l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
-        l &= ~0x03;
-        l |= (div - 1);
+                l &= ~0x03;
+                l |= (div - 1);
+                gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, l);
+        }
 
         return 0;
 }
diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
index 995cc83482eb..434672df702f 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/include/asm-arm/arch-omap/gpmc.h
@@ -23,9 +23,10 @@
 #define GPMC_CS_NAND_DATA       0x24
 
 #define GPMC_CONFIG1_WRAPBURST_SUPP     (1 << 31)
-#define GPMC_CONFIG1_READMULTIPLE_SUPP  (1 << 20)
+#define GPMC_CONFIG1_READMULTIPLE_SUPP  (1 << 30)
 #define GPMC_CONFIG1_READTYPE_ASYNC     (0 << 29)
 #define GPMC_CONFIG1_READTYPE_SYNC      (1 << 29)
+#define GPMC_CONFIG1_WRITEMULTIPLE_SUPP (1 << 28)
 #define GPMC_CONFIG1_WRITETYPE_ASYNC    (0 << 27)
 #define GPMC_CONFIG1_WRITETYPE_SYNC     (1 << 27)
 #define GPMC_CONFIG1_CLKACTIVATIONTIME(val) ((val & 3) << 25)