From: Joel Fernandes <joelf@ti.com>
To: Linux OMAP List <linux-omap@vger.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Tony Lindgren <tony@atomide.com>, Joel Fernandes <joelf@ti.com>
Subject: [PATCH 21/26] ARM: OMAP: dmtimer: Add systimer flag to dmtimer structure
Date: Thu, 24 Apr 2014 16:44:04 -0500 [thread overview]
Message-ID: <1398375849-6017-22-git-send-email-joelf@ti.com> (raw)
In-Reply-To: <1398375849-6017-1-git-send-email-joelf@ti.com>
Add a systimer flag to mark that a timer is used for system timers, this will
help simplify cases where we have to use runtime PM for non system timers, and
we don't have explicitly pass arguments to functions to tell it to do runtime
PM and context save or not.
Also will be useful in upcoming patches to not do certain pm runtime checks
for !systimers.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/mach-omap2/timer.c | 12 ++++++------
arch/arm/plat-omap/dmtimer.c | 11 ++++++-----
arch/arm/plat-omap/include/plat/dmtimer.h | 5 +++--
drivers/media/rc/ir-rx51.c | 4 ++--
drivers/staging/tidspbridge/core/dsp-clock.c | 4 ++--
5 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 2d8ea96..5cceaae 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -64,7 +64,7 @@
/* Clockevent code */
-static struct omap_dm_timer clkev;
+static struct omap_dm_timer clkev = { .systimer = 1 };
static struct clock_event_device clockevent_gpt;
#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
@@ -95,7 +95,7 @@ static struct irqaction omap2_gp_timer_irq = {
static int omap2_gp_timer_set_next_event(unsigned long cycles,
struct clock_event_device *evt)
{
- omap_dm_timer_set_load_start(&clkev, 0xffffffff - cycles, 0, 0);
+ omap_dm_timer_set_load_start(&clkev, 0xffffffff - cycles, 0);
return 0;
}
@@ -105,13 +105,13 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,
{
u32 period;
- omap_dm_timer_stop(&clkev, 0);
+ omap_dm_timer_stop(&clkev);
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
period = clkev.rate / HZ;
period -= 1;
- omap_dm_timer_set_load_start(&clkev, 0xffffffff - period, 1, 0);
+ omap_dm_timer_set_load_start(&clkev, 0xffffffff - period, 1);
break;
case CLOCK_EVT_MODE_ONESHOT:
break;
@@ -415,7 +415,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
}
/* Clocksource code */
-static struct omap_dm_timer clksrc;
+static struct omap_dm_timer clksrc = { .systimer = 1 };
static bool use_gptimer_clksrc;
/*
@@ -524,7 +524,7 @@ static void __init omap2_gptimer_clocksource_init(int gptimer_id,
clocksource_gpt.name = "timer_clksrc";
- omap_dm_timer_set_load_start(&clksrc, 0, 1, 0);
+ omap_dm_timer_set_load_start(&clksrc, 0, 1);
sched_clock_register(dmtimer_read_sched_clock, 32, clksrc.rate);
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 8602586..504784f 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -467,7 +467,7 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
}
EXPORT_SYMBOL_GPL(omap_dm_timer_start);
-int omap_dm_timer_stop(struct omap_dm_timer *timer, int pm)
+int omap_dm_timer_stop(struct omap_dm_timer *timer)
{
u32 l;
unsigned long rate;
@@ -495,7 +495,7 @@ int omap_dm_timer_stop(struct omap_dm_timer *timer, int pm)
/* Ack possibly pending interrupt */
__raw_writel(OMAP_TIMER_INT_OVERFLOW, timer->irq_stat);
- if (pm) {
+ if (!timer->systimer) {
timer->context.tclr = l;
omap_dm_timer_disable(timer);
}
@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_set_load);
/* Optimized set_load which removes costly spin wait in timer_start */
int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, unsigned int load,
- int autoreload, int pm)
+ int autoreload)
{
int rc;
u32 mask = ~0, val = 0;
@@ -597,7 +597,7 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, unsigned int load,
if (unlikely(!timer))
return -EINVAL;
- if (pm) {
+ if (!timer->systimer) {
rc = omap_dm_timer_enable(timer);
if (rc)
return rc;
@@ -615,12 +615,13 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, unsigned int load,
omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, load);
val = omap_dm_timer_write_ctrl(timer, mask, val);
- if (pm) {
+ if (!timer->systimer) {
/* Save the context */
timer->context.tclr = val;
timer->context.tldr = load;
timer->context.tcrr = load;
}
+
return 0;
}
EXPORT_SYMBOL_GPL(omap_dm_timer_set_load_start);
diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h
index 1d3d9bb..7005a1e 100644
--- a/arch/arm/plat-omap/include/plat/dmtimer.h
+++ b/arch/arm/plat-omap/include/plat/dmtimer.h
@@ -118,6 +118,7 @@ struct omap_dm_timer {
int (*get_context_loss_count)(struct device *);
int ctx_loss_count;
int revision;
+ int systimer;
u32 capability;
u32 errata;
struct platform_device *pdev;
@@ -141,12 +142,12 @@ struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer);
int omap_dm_timer_trigger(struct omap_dm_timer *timer);
int omap_dm_timer_start(struct omap_dm_timer *timer);
-int omap_dm_timer_stop(struct omap_dm_timer *timer, int pm);
+int omap_dm_timer_stop(struct omap_dm_timer *timer);
int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source);
int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, unsigned int value);
int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, unsigned int load,
- int autoreload, int pm);
+ int autoreload);
int omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, unsigned int match);
int omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, int toggle, int trigger);
int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler);
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 3dc736d..b1e19a2 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -165,8 +165,8 @@ end:
/* Stop TX here */
lirc_rx51_off(lirc_rx51);
lirc_rx51->wbuf_index = -1;
- omap_dm_timer_stop(lirc_rx51->pwm_timer, 1);
- omap_dm_timer_stop(lirc_rx51->pulse_timer, 1);
+ omap_dm_timer_stop(lirc_rx51->pwm_timer);
+ omap_dm_timer_stop(lirc_rx51->pulse_timer);
omap_dm_timer_set_int_enable(lirc_rx51->pulse_timer, 0);
wake_up_interruptible(&lirc_rx51->wqueue);
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
index 6ac36d1..e4b4181 100644
--- a/drivers/staging/tidspbridge/core/dsp-clock.c
+++ b/drivers/staging/tidspbridge/core/dsp-clock.c
@@ -189,7 +189,7 @@ void dsp_gpt_wait_overflow(short int clk_id, unsigned int load)
* Set counter value to overflow counter after
* one tick and start timer.
*/
- omap_dm_timer_set_load_start(gpt, load, 0, 1);
+ omap_dm_timer_set_load_start(gpt, load, 0);
/* Wait 80us for timer to overflow */
udelay(80);
@@ -300,7 +300,7 @@ int dsp_clk_disable(enum dsp_clk_id clk_id)
clk_disable(iva2_clk);
break;
case GPT_CLK:
- status = omap_dm_timer_stop(timer[clk_id - 1], 1);
+ status = omap_dm_timer_stop(timer[clk_id - 1]);
break;
#ifdef CONFIG_OMAP_MCBSP
case MCBSP_CLK:
--
1.7.9.5
next prev parent reply other threads:[~2014-04-24 21:45 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 21:43 [PATCH 00/26] OMAP dmtimer prep series Joel Fernandes
2014-04-24 21:43 ` [PATCH 01/26] ARM: OMAP: dmtimer: Remove setting of clk parent indirectly through platform hook Joel Fernandes
2014-05-07 15:19 ` Tony Lindgren
2014-05-07 21:43 ` Joel Fernandes
2014-05-07 22:04 ` Tony Lindgren
2014-05-07 22:08 ` Joel Fernandes
2014-04-24 21:43 ` [PATCH 02/26] ARM: OMAP: dmtimer: Add comments on OMAP1 clock framework Joel Fernandes
2014-05-07 15:20 ` Tony Lindgren
2014-05-07 21:48 ` Joel Fernandes
2014-05-07 22:07 ` Tony Lindgren
2014-05-07 22:10 ` Joel Fernandes
2014-04-24 21:43 ` [PATCH 03/26] ARM: OMAP: dmtimer: Add note to set parent from DT Joel Fernandes
2014-04-24 21:43 ` [PATCH 04/26] ARM: OMAP: dmtimer: Add function to check if timer is running Joel Fernandes
2014-05-07 15:25 ` Tony Lindgren
2014-05-07 22:00 ` Joel Fernandes
2014-04-24 21:43 ` [PATCH 05/26] ARM: OMAP1: dmtimer: Rewrite modify of IDLECT mask to use new is_running function Joel Fernandes
2014-04-24 21:43 ` [PATCH 06/26] ARM: OMAP: dmtimer: Add a write_ctrl function to simplify bit setting Joel Fernandes
2014-04-24 21:43 ` [PATCH 07/26] ARM: OMAP: dmtimer: Have __omap_dm_timer_load_start set ST bit in CTRL instead of caller Joel Fernandes
2014-04-24 21:43 ` [PATCH 08/26] ARM: OMAP: dmtimer: Add function to check for timer availability Joel Fernandes
2014-04-24 21:43 ` [PATCH 09/26] ARM: OMAP: dmtimer: Get rid of check for mem resource error Joel Fernandes
2014-05-07 15:24 ` Tony Lindgren
2014-05-07 21:52 ` Joel Fernandes
2014-05-07 22:10 ` Tony Lindgren
2014-05-07 22:14 ` Joel Fernandes
2014-05-07 22:22 ` Tony Lindgren
2014-04-24 21:43 ` [PATCH 10/26] ARM: OMAP: dmtimer: Check return of pm_runtime_get_sync Joel Fernandes
2014-04-24 21:43 ` [PATCH 11/26] ARM: OMAP2+: timer: Add a powerup function Joel Fernandes
2014-04-24 21:43 ` [PATCH 12/26] ARM: OMAP2+: timer: Simplify clock event/source name setting Joel Fernandes
2014-04-24 21:43 ` [PATCH 13/26] ARM: OMAP2+: timer: Add comment on timer clk parenting Joel Fernandes
2014-04-24 21:43 ` [PATCH 14/26] ARM: OMAP2+: timer: Remove hwmod look-up dependency for DT-boot Joel Fernandes
2014-04-24 21:43 ` [PATCH 15/26] ARM: OMAP2+: timer: Use of_clk_get for DT platforms Joel Fernandes
2014-04-24 21:43 ` [PATCH 16/26] ARM: OMAP2+: timer: Fix error message to not use hwmod structure Joel Fernandes
2014-04-24 21:44 ` [PATCH 17/26] ARM: OMAP2+: timer: Add fallback for of_clk_get Joel Fernandes
2014-04-24 21:44 ` [PATCH 18/26] ARM: OMAP2+: timer: Add legacy code for old way of getting fclk Joel Fernandes
2014-04-24 21:44 ` [PATCH 19/26] ARM: OMAP: dmtimer: Remove API __omap_dm_timer_load_start Joel Fernandes
2014-04-24 21:44 ` [PATCH 20/26] ARM: OMAP: dmtimer: Fold back private stop function Joel Fernandes
2014-04-24 21:44 ` Joel Fernandes [this message]
2014-04-24 21:44 ` [PATCH 22/26] ARM: OMAP: dmtimer: Eliminate __omap_dm_timer_write_status function Joel Fernandes
2014-04-24 21:44 ` [PATCH 23/26] ARM: OMAP: dmtimer: Eliminate __omap_dm_timer_read_counter function Joel Fernandes
2014-04-24 21:44 ` [PATCH 24/26] ARM: OMAP: dmtimer: Move private functions into dmtimer core and export others Joel Fernandes
2014-04-24 21:44 ` [PATCH 25/26] ARM: OMAP: dmtimer: Eliminate omap_dm_timer_int_enable function Joel Fernandes
2014-04-24 21:44 ` [PATCH 26/26] ARM: OMAP: dmtimer: Use is_timer_available function in omap_dm_timer_trigger Joel Fernandes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398375849-6017-22-git-send-email-joelf@ti.com \
--to=joelf@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome