summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKai Svahn <kai.svahn@nokia.com>2007-01-26 12:29:40 -0800
committerTony Lindgren <tony@atomide.com>2007-09-20 09:59:26 -0700
commit23300597948131d07eebeb1308c2ba0a1c147494 (patch)
treef287e49b8c52c26659842e69c4e3beb9a924c669 /arch
parentc1ed6407cddbd87206b860f6207731d51c1d57bf (diff)
downloadop-kernel-dev-23300597948131d07eebeb1308c2ba0a1c147494.zip
op-kernel-dev-23300597948131d07eebeb1308c2ba0a1c147494.tar.gz
ARM: OMAP: Merge gpmc changes from N800 tree
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/gpmc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 03595ee..5a4cc20 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -111,6 +111,13 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns)
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)
OpenPOWER on IntegriCloud