projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-realview
/
realview_pba8.c
diff --git
a/arch/arm/mach-realview/realview_pba8.c
b/arch/arm/mach-realview/realview_pba8.c
index 0b037f23b0f68fca500d4e2da21bfab177c4d8dd..dde652a596202a80a35d11300c1343d4dbdf26e9 100644
(file)
--- a/
arch/arm/mach-realview/realview_pba8.c
+++ b/
arch/arm/mach-realview/realview_pba8.c
@@
-264,10
+264,6
@@
static void __init realview_pba8_timer_init(void)
realview_timer_init(IRQ_PBA8_TIMER0_1);
}
realview_timer_init(IRQ_PBA8_TIMER0_1);
}
-static struct sys_timer realview_pba8_timer = {
- .init = realview_pba8_timer_init,
-};
-
static void realview_pba8_restart(char mode, const char *cmd)
{
void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
static void realview_pba8_restart(char mode, const char *cmd)
{
void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
@@
-308,7
+304,7
@@
MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
.map_io = realview_pba8_map_io,
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.map_io = realview_pba8_map_io,
.init_early = realview_init_early,
.init_irq = gic_init_irq,
- .
timer = &realview_pba8_timer
,
+ .
init_time = realview_pba8_timer_init
,
.init_machine = realview_pba8_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
.init_machine = realview_pba8_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,