| From 6d3237bd5d16ab1f33dc531f422cf9a4d5069dcb Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 27 Jan 2014 22:04:17 +0100 |
| Subject: clocksource: sh_cmt: Add memory base to sh_cmt_channel structure |
| |
| 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> |
| (cherry picked from commit c924d2d2a964715b55b6601be338b3bd05a1ced5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_cmt.c | 13 ++++++++----- |
| 1 file changed, 8 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c |
| index eb93b889e189..4fcb05dc9ea4 100644 |
| --- a/drivers/clocksource/sh_cmt.c |
| +++ b/drivers/clocksource/sh_cmt.c |
| @@ -40,6 +40,8 @@ struct sh_cmt_device; |
| struct sh_cmt_channel { |
| struct sh_cmt_device *cmt; |
| |
| + void __iomem *base; |
| + |
| unsigned long flags; |
| unsigned long 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) |
| { |
| - 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) |
| { |
| - 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, |
| @@ -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, |
| 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, |
| 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, |
| 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, |
| @@ -702,6 +704,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, |
| |
| memset(ch, 0, sizeof(*ch)); |
| ch->cmt = cmt; |
| + ch->base = cmt->mapbase_ch; |
| |
| irq = platform_get_irq(cmt->pdev, 0); |
| if (irq < 0) { |
| -- |
| 2.1.2 |
| |