From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 13/24] omap4: clocks: Remove clock hacks from timer-gp.c Date: Tue, 16 Feb 2010 10:41:37 -0800 Message-ID: <20100216184137.GL21755@atomide.com> References: <1266335895-32741-4-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-5-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-6-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-7-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-8-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-9-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-10-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-11-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-12-git-send-email-santosh.shilimkar@ti.com> <1266335895-32741-13-git-send-email-santosh.shilimkar@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:56075 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754863Ab0BPSkv (ORCPT ); Tue, 16 Feb 2010 13:40:51 -0500 Content-Disposition: inline In-Reply-To: <1266335895-32741-13-git-send-email-santosh.shilimkar@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Santosh Shilimkar Cc: linux-omap@vger.kernel.org, ben@fluff.org.uk, sameo@linux.intel.com, lrg@slimlogic.co.uk, paul@pwsan.com * Santosh Shilimkar [100216 07:55]: > Now the omap4 clock framework is mainline and clk_get_rate() > is functional. Hence reomve the hardcoded clock hacks. Should we send this as a fix for 2.6.33, or does this depend on other patches not yet in 2.6.33? Regards, Tony > This patch also fixes > Division by zero in kernel. > Backtrace: > [] (dump_backtrace+0x0/0x110) from [] (dump_stack+0x18/0x1c) > r7:60000093 r6:c0641050 r5:c0223e78 r4:c02126b4 > [] (dump_stack+0x0/0x1c) from [] (__div0+0x18/0x20) > [] (__div0+0x0/0x20) from [] (Ldiv0+0x8/0x10) > [] (omap_dm_timer_stop+0x0/0xb0) from [] (omap2_gp_timer_set_mode+0x1c/0x68) > r5:c0223e78 r4:00000000 > [] (omap2_gp_timer_set_mode+0x0/0x68) from [] (clockevents_set_mode+0x30/0x64) > r5:c020cae0 r4:00000000 > [] (clockevents_set_mode+0x0/0x64) from [] (clockevents_exchange_device+0x30/0x9c) > r5:c020cae0 r4:c02146e0 > [] (clockevents_exchange_device+0x0/0x9c) from [] (tick_notify+0x17c/0x404) > r7:00000000 r6:c0641050 r5:00000000 r4:c020cae0 > [] (tick_notify+0x0/0x404) from [] (notifier_call_chain+0x34/0x78) > [] (notifier_call_chain+0x0/0x78) from [] (__raw_notifier_call_chain+0x1c/0x24) > [] (__raw_notifier_call_chain+0x0/0x24) from [] (raw_notifier_call_chain+0x20/0x28) > [] (raw_notifier_call_chain+0x0/0x28) from [] (clockevents_do_notify+0x1c/0x24) > [] (clockevents_do_notify+0x0/0x24) from [] (clockevents_register_device+0x98/0xd0) > [] (clockevents_register_device+0x0/0xd0) from [] (percpu_timer_setup+0x80/0x9c) > r7:00000000 r6:00000002 r5:00000002 r4:00000003 > [] (percpu_timer_setup+0x0/0x9c) from [] (smp_prepare_cpus+0xb0/0xe8) > [] (smp_prepare_cpus+0x0/0xe8) from [] (kernel_init+0x5c/0x1fc) > r7:00000000 r6:00000000 r5:00000000 r4:c001b8a4 > [] (kernel_init+0x0/0x1fc) from [] (do_exit+0x0/0x604) > r7:00000000 r6:00000000 r5:00000000 r4:00000000 > > Signed-off-by: Santosh Shilimkar > --- > arch/arm/mach-omap2/timer-gp.c | 5 ----- > 1 files changed, 0 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c > index cd04dea..74fbed8 100644 > --- a/arch/arm/mach-omap2/timer-gp.c > +++ b/arch/arm/mach-omap2/timer-gp.c > @@ -85,8 +85,6 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode, > case CLOCK_EVT_MODE_PERIODIC: > period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; > period -= 1; > - if (cpu_is_omap44xx()) > - period = 0xff; /* FIXME: */ > omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period); > break; > case CLOCK_EVT_MODE_ONESHOT: > @@ -150,9 +148,6 @@ static void __init omap2_gp_clockevent_init(void) > "timer-gp: omap_dm_timer_set_source() failed\n"); > > tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer)); > - if (cpu_is_omap44xx()) > - /* Assuming 32kHz clk is driving GPT1 */ > - tick_rate = 32768; /* FIXME: */ > > pr_info("OMAP clockevent source: GPTIMER%d at %u Hz\n", > gptimer_id, tick_rate); > -- > 1.6.0.4 >