Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23300597 authored by Kai Svahn's avatar Kai Svahn Committed by Tony Lindgren
Browse files

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: default avatarKai Svahn <kai.svahn@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c1ed6407

arch/arm/mach-omap2/gpmc.c

+7 −0
Original line number Diff line number Diff line
@@ -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)

include/asm-arm/arch-omap/gpmc.h

+2 −0
Original line number Diff line number Diff line
@@ -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);