Title: [6559] branches/2009R1/arch/blackfin: Port commit 6556 and 6557 from trunk to branch 09R1
- Revision
- 6559
- Author
- gyang
- Date
- 2009-06-03 05:30:30 -0500 (Wed, 03 Jun 2009)
Log Message
Port commit 6556 and 6557 from trunk to branch 09R1
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/Kconfig (6558 => 6559)
--- branches/2009R1/arch/blackfin/Kconfig 2009-06-03 10:28:59 UTC (rev 6558)
+++ branches/2009R1/arch/blackfin/Kconfig 2009-06-03 10:30:30 UTC (rev 6559)
@@ -602,7 +602,6 @@
config GENERIC_TIME
bool "Generic time"
- depends on !IPIPE
default y
config GENERIC_CLOCKEVENTS
@@ -618,6 +617,7 @@
config TICKSOURCE_GPTMR0
bool "Gptimer0 (SCLK domain)"
select BFIN_GPTIMERS
+ depends on !IPIPE
config TICKSOURCE_CORETMR
bool "Core timer (CCLK domain)"
Modified: branches/2009R1/arch/blackfin/kernel/time-ts.c (6558 => 6559)
--- branches/2009R1/arch/blackfin/kernel/time-ts.c 2009-06-03 10:28:59 UTC (rev 6558)
+++ branches/2009R1/arch/blackfin/kernel/time-ts.c 2009-06-03 10:30:30 UTC (rev 6559)
@@ -155,7 +155,7 @@
.rating = 300,
.irq = IRQ_TIMER0,
#else
- .name = "bfin_coretimer",
+ .name = "bfin_core_timer",
.rating = 350,
.irq = IRQ_CORETMR,
#endif
Modified: branches/2009R1/arch/blackfin/mach-common/ints-priority.c (6558 => 6559)
--- branches/2009R1/arch/blackfin/mach-common/ints-priority.c 2009-06-03 10:28:59 UTC (rev 6558)
+++ branches/2009R1/arch/blackfin/mach-common/ints-priority.c 2009-06-03 10:30:30 UTC (rev 6559)
@@ -1231,13 +1231,8 @@
if (likely(vec == EVT_IVTMR_P)) {
irq = IRQ_CORETMR;
- goto core_tick;
- }
-
- SSYNC();
-
+ } else {
#if defined(SIC_ISR0) || defined(SICA_ISR0)
- {
unsigned long sic_status[3];
sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
@@ -1253,9 +1248,7 @@
if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
break;
}
- }
#else
- {
unsigned long sic_status;
sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
@@ -1267,15 +1260,14 @@
} else if (sic_status & ivg->isrflag)
break;
}
- }
#endif
irq = ivg->irqno;
+ }
+
if (irq == IRQ_SYSTMR) {
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
-core_tick:
-#else
+#ifndef CONFIG_GENERIC_CLOCKEVENTS
bfin_write_TIMER_STATUS(1); /* Latch TIMIL0 */
#endif
/* This is basically what we need from the register frame. */
@@ -1287,9 +1279,6 @@
__raw_get_cpu_var(__ipipe_tick_regs).ipend |= 0x10;
}
-#ifndef CONFIG_GENERIC_CLOCKEVENTS
-core_tick:
-#endif
if (this_domain == ipipe_root_domain) {
s = __test_and_set_bit(IPIPE_SYNCDEFER_FLAG, &p->status);
barrier();
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
