Title: [6492] trunk/arch/blackfin: Fix bug [#5141], blackfin current not support Adeos with generic time framework
- Revision
- 6492
- Author
- gyang
- Date
- 2009-05-27 04:35:07 -0500 (Wed, 27 May 2009)
Log Message
Fix bug [#5141], blackfin current not support Adeos with generic time framework
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (6491 => 6492)
--- trunk/arch/blackfin/Kconfig 2009-05-27 09:33:35 UTC (rev 6491)
+++ trunk/arch/blackfin/Kconfig 2009-05-27 09:35:07 UTC (rev 6492)
@@ -601,6 +601,7 @@
config GENERIC_TIME
bool "Generic time"
+ depends on !IPIPE
default y
config GENERIC_CLOCKEVENTS
Modified: trunk/arch/blackfin/kernel/time-ts.c (6491 => 6492)
--- trunk/arch/blackfin/kernel/time-ts.c 2009-05-27 09:33:35 UTC (rev 6491)
+++ trunk/arch/blackfin/kernel/time-ts.c 2009-05-27 09:35:07 UTC (rev 6492)
@@ -150,7 +150,7 @@
struct clock_event_device *);
static struct clock_event_device clockevent_bfin = {
-#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0)
.name = "bfin_gptimer0",
.rating = 300,
.irq = IRQ_TIMER0,
@@ -167,7 +167,7 @@
};
static struct irqaction bfin_timer_irq = {
-#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0)
.name = "Blackfin GPTimer0",
#else
.name = "Blackfin CoreTimer",
@@ -178,7 +178,7 @@
.dev_id = &clockevent_bfin,
};
-#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE)
+#if defined(CONFIG_TICKSOURCE_GPTMR0)
static int bfin_timer_set_next_event(unsigned long cycles,
struct clock_event_device *evt)
{
@@ -310,7 +310,7 @@
bfin_timer_init();
bfin_timer_set_mode(CLOCK_EVT_MODE_PERIODIC, NULL);
}
-#endif /* CONFIG_TICKSOURCE_GPTMR0 || CONFIG_IPIPE */
+#endif /* CONFIG_TICKSOURCE_GPTMR0 */
/*
* timer_interrupt() needs to keep up the real-time clock,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
