diff options
author | Kai Svahn <kai.svahn@nokia.com> | 2007-01-26 15:29:40 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-09-20 12:59:26 -0400 |
commit | 23300597948131d07eebeb1308c2ba0a1c147494 (patch) | |
tree | f287e49b8c52c26659842e69c4e3beb9a924c669 /arch/arm/mach-omap2 | |
parent | c1ed6407cddbd87206b860f6207731d51c1d57bf (diff) |
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/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 03595ee72ed3..5a4cc2076a7d 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) | |||
111 | return (time_ns * 1000 + tick_ps - 1) / tick_ps; | 111 | return (time_ns * 1000 + tick_ps - 1) / tick_ps; |
112 | } | 112 | } |
113 | 113 | ||
114 | unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns) | ||
115 | { | ||
116 | unsigned long ticks = gpmc_ns_to_ticks(time_ns); | ||
117 | |||
118 | return ticks * gpmc_get_fclk_period() / 1000; | ||
119 | } | ||
120 | |||
114 | #ifdef DEBUG | 121 | #ifdef DEBUG |
115 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, | 122 | static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, |
116 | int time, const char *name) | 123 | int time, const char *name) |