diff for duplicates of <87zkob6ixi.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index fbd2fdd..216c56f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,46 +40,3 @@ instead of $SUBJECT patch? At least we won't loose functionality while working on this feature. Kevin - - ->From e7affbb60e292b507ee1259b6a47f1e30b7fc071 Mon Sep 17 00:00:00 2001 -From: Kevin Hilman <khilman@ti.com> -Date: Thu, 31 Mar 2011 14:49:27 -0700 -Subject: [PATCH] OMAP2+: PM debug: update suspend wakeup timer for DM timer changes - -Signed-off-by: Kevin Hilman <khilman@ti.com> ---- - arch/arm/mach-omap2/pm-debug.c | 4 ++-- - arch/arm/mach-omap2/timer-gp.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c -index a5a83b3..eccf117 100644 ---- a/arch/arm/mach-omap2/pm-debug.c -+++ b/arch/arm/mach-omap2/pm-debug.c -@@ -171,8 +171,8 @@ void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds) - - tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup)); - cycles = tick_rate * seconds + tick_rate * milliseconds / 1000; -- omap_dm_timer_stop(gptimer_wakeup); -- omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles); -+ __omap_dm_timer_load_start(gptimer_wakeup->io_base, OMAP_TIMER_CTRL_ST, -+ 0xffffffff - cycles, 1); - - pr_info("PM: Resume timer in %u.%03u secs" - " (%d ticks at %d ticks/sec.)\n", -diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c -index c21e99f..52100b2 100644 ---- a/arch/arm/mach-omap2/timer-gp.c -+++ b/arch/arm/mach-omap2/timer-gp.c -@@ -76,7 +76,7 @@ static struct omap_dm_timer *gptimer; - static struct clock_event_device clockevent_gpt; - static u8 __initdata gptimer_id = 1; - static u8 __initdata inited; --struct omap_dm_timer *gptimer_wakeup; -+struct omap_dm_timer *gptimer_wakeup = &clkev; - - static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) - { --- -1.7.4 diff --git a/a/content_digest b/N1/content_digest index 169b2ff..2a075a6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,9 @@ "ref\020110328221501.4046.41079.stgit@baageli.muru.com\0" "ref\020110328222142.4046.4677.stgit@baageli.muru.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH 06/10] omap2+: Remove gptimer_wakekup for now\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH 06/10] omap2+: Remove gptimer_wakekup for now\0" "Date\0Thu, 31 Mar 2011 15:09:45 -0700\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " linux-omap@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Tony Lindgren <tony@atomide.com> writes:\n" @@ -49,49 +47,6 @@ "instead of $SUBJECT patch? At least we won't loose functionality while\n" "working on this feature.\n" "\n" - "Kevin\n" - "\n" - "\n" - ">From e7affbb60e292b507ee1259b6a47f1e30b7fc071 Mon Sep 17 00:00:00 2001\n" - "From: Kevin Hilman <khilman@ti.com>\n" - "Date: Thu, 31 Mar 2011 14:49:27 -0700\n" - "Subject: [PATCH] OMAP2+: PM debug: update suspend wakeup timer for DM timer changes\n" - "\n" - "Signed-off-by: Kevin Hilman <khilman@ti.com>\n" - "---\n" - " arch/arm/mach-omap2/pm-debug.c | 4 ++--\n" - " arch/arm/mach-omap2/timer-gp.c | 2 +-\n" - " 2 files changed, 3 insertions(+), 3 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c\n" - "index a5a83b3..eccf117 100644\n" - "--- a/arch/arm/mach-omap2/pm-debug.c\n" - "+++ b/arch/arm/mach-omap2/pm-debug.c\n" - "@@ -171,8 +171,8 @@ void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)\n" - " \n" - " \ttick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup));\n" - " \tcycles = tick_rate * seconds + tick_rate * milliseconds / 1000;\n" - "-\tomap_dm_timer_stop(gptimer_wakeup);\n" - "-\tomap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles);\n" - "+\t__omap_dm_timer_load_start(gptimer_wakeup->io_base, OMAP_TIMER_CTRL_ST,\n" - "+\t\t\t\t 0xffffffff - cycles, 1);\n" - " \n" - " \tpr_info(\"PM: Resume timer in %u.%03u secs\"\n" - " \t\t\" (%d ticks at %d ticks/sec.)\\n\",\n" - "diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c\n" - "index c21e99f..52100b2 100644\n" - "--- a/arch/arm/mach-omap2/timer-gp.c\n" - "+++ b/arch/arm/mach-omap2/timer-gp.c\n" - "@@ -76,7 +76,7 @@ static struct omap_dm_timer *gptimer;\n" - " static struct clock_event_device clockevent_gpt;\n" - " static u8 __initdata gptimer_id = 1;\n" - " static u8 __initdata inited;\n" - "-struct omap_dm_timer *gptimer_wakeup;\n" - "+struct omap_dm_timer *gptimer_wakeup = &clkev;\n" - " \n" - " static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)\n" - " {\n" - "-- \n" - 1.7.4 + Kevin -f5bfe05d6698595a1a1acd2ac5a9fa10c83fbab00273eab014ae8b3bad0263c9 +c217660876d1115d4fd9efa98a686d6435611995b9d4c90572a5ee9e0125deeb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.