Skip to content

Commit

Permalink
ARM: EXYNOS4: Remove clock event timers using ARM private timers
Browse files Browse the repository at this point in the history
External GIC cannot support PPI (Private Peripheral Interrupt) for
ARM private timers. Thus MCT should be selected as clock event timers
by default.

Signed-off-by: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Changhwan Youn authored and Kukjin Kim committed Jul 20, 2011
1 parent aab74d3 commit 069d4e7
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 343 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-exynos4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ config CPU_EXYNOS4210
Enable EXYNOS4210 CPU support

config EXYNOS4_MCT
bool "Kernel timer support by MCT"
bool
default y
help
Use MCT (Multi Core Timer) as kernel timers

Expand Down
7 changes: 1 addition & 6 deletions arch/arm/mach-exynos4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

ifeq ($(CONFIG_EXYNOS4_MCT),y)
obj-y += mct.o
else
obj-y += time.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
endif
obj-$(CONFIG_EXYNOS4_MCT) += mct.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-exynos4/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void __init exynos4_init_irq(void)
{
int irq;

gic_init(0, IRQ_LOCALTIMER, S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
gic_init(0, IRQ_SPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
gic_arch_extn.irq_eoi = exynos4_gic_irq_eoi;

for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mach-exynos4/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,4 @@
/* As above, this assumes that irqstat and base are preserved.. */

.macro test_for_ltirq, irqnr, irqstat, base, tmp
bic \irqnr, \irqstat, #0x1c00
mov \tmp, #0
cmp \irqnr, #29
moveq \tmp, #1
streq \irqstat, [\base, #GIC_CPU_EOI]
cmp \tmp, #0
.endm
2 changes: 0 additions & 2 deletions arch/arm/mach-exynos4/include/mach/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

#define IRQ_PPI(x) S5P_IRQ(x+16)

#define IRQ_LOCALTIMER IRQ_PPI(13)

/* SPI: Shared Peripheral Interrupt */

#define IRQ_SPI(x) S5P_IRQ(x+32)
Expand Down
26 changes: 0 additions & 26 deletions arch/arm/mach-exynos4/localtimer.c

This file was deleted.

301 changes: 0 additions & 301 deletions arch/arm/mach-exynos4/time.c

This file was deleted.

0 comments on commit 069d4e7

Please sign in to comment.