[PATCH 13/18] ARM: OMAP: Merge gpmc changes from N800 tree

Tony Lindgren
2007-04-09T21:38:39Z

From: Kai Svahn <kai.svahn@nokia.com>

This patch merges gpmc changes from N800 tree
and adds gpmc_get_fclk_period() to gpmc.h.

Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/gpmc.c | 7 +++++++
include/asm-arm/arch-omap/gpmc.h | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)

Index: linux-2.6/arch/arm/mach-omap2/gpmc.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-omap2/gpmc.c 2007-04-09 16:36:48.000000000 -0400
+++ linux-2.6/arch/arm/mach-omap2/gpmc.c 2007-04-09 16:36:54.000000000 -0400
@@ -111,6 +111,13 @@ unsigned int gpmc_ns_to_ticks(unsigned i
return (time_ns * 1000 + tick_ps - 1) / tick_ps;
}

+unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns)
+{
+ unsigned long ticks = gpmc_ns_to_ticks(time_ns);
+
+ return ticks * gpmc_get_fclk_period() / 1000;
+}
+
#ifdef DEBUG
static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
int time, const char *name)
Index: linux-2.6/include/asm-arm/arch-omap/gpmc.h
===================================================================
--- linux-2.6.orig/include/asm-arm/arch-omap/gpmc.h 2007-04-09 16:36:41.000000000 -0400
+++ linux-2.6/include/asm-arm/arch-omap/gpmc.h 2007-04-09 16:36:54.000000000 -0400
@@ -81,6 +81,8 @@ struct gpmc_timings {
};

extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns);
+extern unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns);
+extern unsigned long gpmc_get_fclk_period(void);

extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
extern u32 gpmc_cs_read_reg(int cs, int idx);