diff options
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh7372.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index c917882424a7..191ae72e21ba 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c | |||
@@ -1054,7 +1054,7 @@ void __init sh7372_add_standard_devices(void) | |||
1054 | ARRAY_SIZE(domain_devices)); | 1054 | ARRAY_SIZE(domain_devices)); |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | static void __init sh7372_earlytimer_init(void) | 1057 | void __init sh7372_earlytimer_init(void) |
1058 | { | 1058 | { |
1059 | sh7372_clock_init(); | 1059 | sh7372_clock_init(); |
1060 | shmobile_earlytimer_init(); | 1060 | shmobile_earlytimer_init(); |
@@ -1067,9 +1067,6 @@ void __init sh7372_add_early_devices(void) | |||
1067 | 1067 | ||
1068 | /* setup early console here as well */ | 1068 | /* setup early console here as well */ |
1069 | shmobile_setup_console(); | 1069 | shmobile_setup_console(); |
1070 | |||
1071 | /* override timer setup with soc-specific code */ | ||
1072 | shmobile_timer.init = sh7372_earlytimer_init; | ||
1073 | } | 1070 | } |
1074 | 1071 | ||
1075 | #ifdef CONFIG_USE_OF | 1072 | #ifdef CONFIG_USE_OF |
@@ -1113,7 +1110,7 @@ DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)") | |||
1113 | .init_irq = sh7372_init_irq, | 1110 | .init_irq = sh7372_init_irq, |
1114 | .handle_irq = shmobile_handle_irq_intc, | 1111 | .handle_irq = shmobile_handle_irq_intc, |
1115 | .init_machine = sh7372_add_standard_devices_dt, | 1112 | .init_machine = sh7372_add_standard_devices_dt, |
1116 | .timer = &shmobile_timer, | 1113 | .init_time = shmobile_timer_init, |
1117 | .dt_compat = sh7372_boards_compat_dt, | 1114 | .dt_compat = sh7372_boards_compat_dt, |
1118 | MACHINE_END | 1115 | MACHINE_END |
1119 | 1116 | ||