iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: shmobile: Make r8a7790 Arch timer optional

Browse Source 
Update the r8a7790 code to allow using other
timers than Arch timer for clock events.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Magnus Damm 2013-06-28 20:27:13 +09:00 committed by Simon Horman
parent 99ade1a0f0
commit 8333d8c995
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/Kconfig
View File

@ -61,7 +61,6 @@ config ARCH_R8A7790
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC select ARM_GIC
select CPU_V7 select CPU_V7
select HAVE_ARM_ARCH_TIMER
select SH_CLK_CPG select SH_CLK_CPG
select RENESAS_IRQC select RENESAS_IRQC

1
arch/arm/mach-shmobile/board-lager.c
View File

@ -102,6 +102,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
}; };
DT_MACHINE_START(LAGER_DT, "lager") DT_MACHINE_START(LAGER_DT, "lager")
.init_early = r8a7790_init_delay,
.init_time = r8a7790_timer_init, .init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices, .init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt, .dt_compat = lager_boards_compat_dt,

1
arch/arm/mach-shmobile/include/mach/r8a7790.h
View File

@ -4,6 +4,7 @@
void r8a7790_add_standard_devices(void); void r8a7790_add_standard_devices(void);
void r8a7790_clock_init(void); void r8a7790_clock_init(void);
void r8a7790_pinmux_init(void); void r8a7790_pinmux_init(void);
void r8a7790_init_delay(void);
void r8a7790_timer_init(void); void r8a7790_timer_init(void);
#endif /* __ASM_R8A7790_H__ */ #endif /* __ASM_R8A7790_H__ */

8
arch/arm/mach-shmobile/setup-r8a7790.c
View File

@ -208,6 +208,13 @@ void __init r8a7790_timer_init(void)
shmobile_timer_init(); shmobile_timer_init();
} }
void __init r8a7790_init_delay(void)
{
#ifndef CONFIG_ARM_ARCH_TIMER
shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
#endif
}
#ifdef CONFIG_USE_OF #ifdef CONFIG_USE_OF
static const char *r8a7790_boards_compat_dt[] __initdata = { static const char *r8a7790_boards_compat_dt[] __initdata = {
@ -216,6 +223,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
}; };
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
.init_early = r8a7790_init_delay,
.init_time = r8a7790_timer_init, .init_time = r8a7790_timer_init,
.dt_compat = r8a7790_boards_compat_dt, .dt_compat = r8a7790_boards_compat_dt,
MACHINE_END MACHINE_END