leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clocksource: sh_cmt: Add control register callbacks

Browse Source 
This patch adds control register callbacks for the CMT
driver. At this point only 16-bit access is supported
but in the future this will be updated to allow 32-bit
access as well.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: John Stultz <john.stultz@linaro.org>
Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2012-12-14 14:54:28 +09:00 committed by Simon Horman
parent a6a912ca43
commit cccd70455c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/clocksource/sh_cmt.c
View File

@ -55,6 +55,11 @@ struct sh_cmt_priv {
unsigned long total_cycles; unsigned long total_cycles;
bool cs_enabled; bool cs_enabled;
/* callbacks for CMSTR and CMCSR access */
unsigned long (*read_control)(void __iomem *base, unsigned long offs);
void (*write_control)(void __iomem *base, unsigned long offs,
unsigned long value);
/* callbacks for CMCNT and CMCOR access */ /* callbacks for CMCNT and CMCOR access */
unsigned long (*read_count)(void __iomem *base, unsigned long offs); unsigned long (*read_count)(void __iomem *base, unsigned long offs);
void (*write_count)(void __iomem *base, unsigned long offs, void (*write_count)(void __iomem *base, unsigned long offs,
@ -91,12 +96,12 @@ static inline unsigned long sh_cmt_read_cmstr(struct sh_cmt_priv *p)
{ {
struct sh_timer_config *cfg = p->pdev->dev.platform_data; struct sh_timer_config *cfg = p->pdev->dev.platform_data;
return sh_cmt_read16(p->mapbase - cfg->channel_offset, 0); return p->read_control(p->mapbase - cfg->channel_offset, 0);
} }
static inline unsigned long sh_cmt_read_cmcsr(struct sh_cmt_priv *p) static inline unsigned long sh_cmt_read_cmcsr(struct sh_cmt_priv *p)
{ {
return sh_cmt_read16(p->mapbase, CMCSR); return p->read_control(p->mapbase, CMCSR);
} }
static inline unsigned long sh_cmt_read_cmcnt(struct sh_cmt_priv *p) static inline unsigned long sh_cmt_read_cmcnt(struct sh_cmt_priv *p)
@ -109,13 +114,13 @@ static inline void sh_cmt_write_cmstr(struct sh_cmt_priv *p,
{ {
struct sh_timer_config *cfg = p->pdev->dev.platform_data; struct sh_timer_config *cfg = p->pdev->dev.platform_data;
sh_cmt_write16(p->mapbase - cfg->channel_offset, 0, value); p->write_control(p->mapbase - cfg->channel_offset, 0, value);
} }
static inline void sh_cmt_write_cmcsr(struct sh_cmt_priv *p, static inline void sh_cmt_write_cmcsr(struct sh_cmt_priv *p,
unsigned long value) unsigned long value)
{ {
sh_cmt_write16(p->mapbase, CMCSR, value); p->write_control(p->mapbase, CMCSR, value);
} }
static inline void sh_cmt_write_cmcnt(struct sh_cmt_priv *p, static inline void sh_cmt_write_cmcnt(struct sh_cmt_priv *p,
@ -702,6 +707,9 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
goto err1; goto err1;
} }
p->read_control = sh_cmt_read16;
p->write_control = sh_cmt_write16;
if (resource_size(res) == 6) { if (resource_size(res) == 6) {
p->width = 16; p->width = 16;
p->read_count = sh_cmt_read16; p->read_count = sh_cmt_read16;