aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-11 13:32:21 -0400
committerOlof Johansson <olof@lixom.net>2013-04-11 13:32:39 -0400
commitf6940610c76e9a6dbb23cef51b64fd48877b68df (patch)
tree535d759034c9a4fc5f3555b45cb7758a2809144c /arch/arm/mach-shmobile
parent432b473419d9833ff9c48c768f2c8de35185609e (diff)
parentab5fdfd5ea621b629da9bfda987af301da973525 (diff)
Merge tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2
From Simon Horman: Renesas ARM based r8a7790 SoC update for v3.10 * Force architecture timer to be activated regardless of bootloader - This is necessary for the lager board to boot * Add second memory range to r8a7790 PFC device - This is in preparation for further PFC work. It should not break anything as it is not used yet. This pull request is based on: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc2-for-v3.10 * tag 'renesas-soc-r8a7790-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: force enable of r8a7790 arch timer ARM: shmobile: Add second I/O range for r8a7790 PFC Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/include/mach/r8a7790.h1
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7790.c15
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h
index 9bd6f5c894bb..2e919e61fa0d 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h
@@ -4,5 +4,6 @@
4void r8a7790_add_standard_devices(void); 4void r8a7790_add_standard_devices(void);
5void r8a7790_clock_init(void); 5void r8a7790_clock_init(void);
6void r8a7790_pinmux_init(void); 6void r8a7790_pinmux_init(void);
7void r8a7790_timer_init(void);
7 8
8#endif /* __ASM_R8A7790_H__ */ 9#endif /* __ASM_R8A7790_H__ */
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 */