Title: [6467] branches/2009R1/arch/blackfin: Remove Kconfig options CONFIG_TICK_SOURCE_SYSTMR0, use CONFIG_TICKSOURCE_GPTMR0 instead
- Revision
- 6467
- Author
- gyang
- Date
- 2009-05-25 00:38:53 -0500 (Mon, 25 May 2009)
Log Message
Remove Kconfig options CONFIG_TICK_SOURCE_SYSTMR0, use CONFIG_TICKSOURCE_GPTMR0 instead
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/Kconfig (6466 => 6467)
--- branches/2009R1/arch/blackfin/Kconfig 2009-05-25 04:28:46 UTC (rev 6466)
+++ branches/2009R1/arch/blackfin/Kconfig 2009-05-25 05:38:53 UTC (rev 6467)
@@ -241,12 +241,6 @@
depends on SMP
default y
-config TICK_SOURCE_SYSTMR0
- bool
- select BFIN_GPTIMERS
- depends on SMP
- default y
-
config BF_REV_MIN
int
default 0 if (BF51x || BF52x || (BF54x && !BF54xM))
Modified: branches/2009R1/arch/blackfin/kernel/time.c (6466 => 6467)
--- branches/2009R1/arch/blackfin/kernel/time.c 2009-05-25 04:28:46 UTC (rev 6466)
+++ branches/2009R1/arch/blackfin/kernel/time.c 2009-05-25 05:38:53 UTC (rev 6467)
@@ -31,7 +31,7 @@
#endif
};
-#if defined(CONFIG_TICK_SOURCE_SYSTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
void __init setup_system_timer0(void)
{
/* Power down the core timer, just to play safe. */
@@ -74,7 +74,7 @@
static void __init
time_sched_init(irqreturn_t(*timer_routine) (int, void *))
{
-#if defined(CONFIG_TICK_SOURCE_SYSTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
setup_system_timer0();
bfin_timer_irq.handler = timer_routine;
setup_irq(IRQ_TIMER0, &bfin_timer_irq);
@@ -94,7 +94,7 @@
unsigned long offset;
unsigned long clocks_per_jiffy;
-#if defined(CONFIG_TICK_SOURCE_SYSTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
clocks_per_jiffy = bfin_read_TIMER0_PERIOD();
offset = bfin_read_TIMER0_COUNTER() / \
(((clocks_per_jiffy + 1) * HZ) / USEC_PER_SEC);
@@ -133,7 +133,7 @@
static long last_rtc_update;
write_seqlock(&xtime_lock);
-#if defined(CONFIG_TICK_SOURCE_SYSTMR0) && !defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0) && !defined(CONFIG_IPIPE)
/*
* TIMIL0 is latched in __ipipe_grab_irq() when the I-Pipe is
* enabled.
@@ -159,7 +159,7 @@
/* Do it again in 60s. */
last_rtc_update = xtime.tv_sec - 600;
}
-#if defined(CONFIG_TICK_SOURCE_SYSTMR0) && !defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0) && !defined(CONFIG_IPIPE)
set_gptimer_status(0, TIMER_STATUS_TIMIL0);
}
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
