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

clocksource: sh_cmt: Add memory base to sh_cmt_channel structure

Browse Source 
The channel memory base is channel-specific, add it to the channel
structure in preparation for support of multiple channels per device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2014-01-27 22:04:17 +01:00
parent 36f1ac982d
commit c924d2d2a9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/clocksource/sh_cmt.c
View File

@@ -40,6 +40,8 @@ struct sh_cmt_device;
struct sh_cmt_channel { struct sh_cmt_channel {
struct sh_cmt_device *cmt; struct sh_cmt_device *cmt;
void __iomem *base;
unsigned long flags; unsigned long flags;
unsigned long match_value; unsigned long match_value;
unsigned long next_match_value; unsigned long next_match_value;
@@ -130,12 +132,12 @@ static inline unsigned long sh_cmt_read_cmstr(struct sh_cmt_channel *ch)
static inline unsigned long sh_cmt_read_cmcsr(struct sh_cmt_channel *ch) static inline unsigned long sh_cmt_read_cmcsr(struct sh_cmt_channel *ch)
{ {
return ch->cmt->read_control(ch->cmt->mapbase_ch, CMCSR); return ch->cmt->read_control(ch->base, CMCSR);
} }
static inline unsigned long sh_cmt_read_cmcnt(struct sh_cmt_channel *ch) static inline unsigned long sh_cmt_read_cmcnt(struct sh_cmt_channel *ch)
{ {
return ch->cmt->read_count(ch->cmt->mapbase_ch, CMCNT); return ch->cmt->read_count(ch->base, CMCNT);
} }
static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch, static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch,
@@ -147,19 +149,19 @@ static inline void sh_cmt_write_cmstr(struct sh_cmt_channel *ch,
static inline void sh_cmt_write_cmcsr(struct sh_cmt_channel *ch, static inline void sh_cmt_write_cmcsr(struct sh_cmt_channel *ch,
unsigned long value) unsigned long value)
{ {
ch->cmt->write_control(ch->cmt->mapbase_ch, CMCSR, value); ch->cmt->write_control(ch->base, CMCSR, value);
} }
static inline void sh_cmt_write_cmcnt(struct sh_cmt_channel *ch, static inline void sh_cmt_write_cmcnt(struct sh_cmt_channel *ch,
unsigned long value) unsigned long value)
{ {
ch->cmt->write_count(ch->cmt->mapbase_ch, CMCNT, value); ch->cmt->write_count(ch->base, CMCNT, value);
} }
static inline void sh_cmt_write_cmcor(struct sh_cmt_channel *ch, static inline void sh_cmt_write_cmcor(struct sh_cmt_channel *ch,
unsigned long value) unsigned long value)
{ {
ch->cmt->write_count(ch->cmt->mapbase_ch, CMCOR, value); ch->cmt->write_count(ch->base, CMCOR, value);
} }
static unsigned long sh_cmt_get_counter(struct sh_cmt_channel *ch, static unsigned long sh_cmt_get_counter(struct sh_cmt_channel *ch,
@@ -702,6 +704,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch,
memset(ch, 0, sizeof(*ch)); memset(ch, 0, sizeof(*ch));
ch->cmt = cmt; ch->cmt = cmt;
ch->base = cmt->mapbase_ch;
irq = platform_get_irq(cmt->pdev, 0); irq = platform_get_irq(cmt->pdev, 0);
if (irq < 0) { if (irq < 0) {