aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/setup-r8a7790.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7790.c')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7790.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 481201a4f3f5..49de2d56f86d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -31,6 +31,7 @@
31 31
32static const struct resource pfc_resources[] = { 32static const struct resource pfc_resources[] = {
33 DEFINE_RES_MEM(0xe6060000, 0x250), 33 DEFINE_RES_MEM(0xe6060000, 0x250),
34 DEFINE_RES_MEM(0xe6050000, 0x5050),
34}; 35};
35 36
36void __init r8a7790_pinmux_init(void) 37void __init r8a7790_pinmux_init(void)
@@ -117,6 +118,18 @@ void __init r8a7790_add_standard_devices(void)
117 r8a7790_register_irqc(0); 118 r8a7790_register_irqc(0);
118} 119}
119 120
121void __init r8a7790_timer_init(void)
122{
123 void __iomem *cntcr;
124
125 /* make sure arch timer is started by setting bit 0 of CNTCT */
126 cntcr = ioremap(0xe6080000, PAGE_SIZE);
127 iowrite32(1, cntcr);
128 iounmap(cntcr);
129
130 shmobile_timer_init();
131}
132
120#ifdef CONFIG_USE_OF 133#ifdef CONFIG_USE_OF
121void __init r8a7790_add_standard_devices_dt(void) 134void __init r8a7790_add_standard_devices_dt(void)
122{ 135{
@@ -131,7 +144,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
131DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") 144DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
132 .init_irq = irqchip_init, 145 .init_irq = irqchip_init,
133 .init_machine = r8a7790_add_standard_devices_dt, 146 .init_machine = r8a7790_add_standard_devices_dt,
134 .init_time = shmobile_timer_init, 147 .init_time = r8a7790_timer_init,
135 .dt_compat = r8a7790_boards_compat_dt, 148 .dt_compat = r8a7790_boards_compat_dt,
136MACHINE_END 149MACHINE_END
137#endif /* CONFIG_USE_OF */ 150#endif /* CONFIG_USE_OF */