ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
Move the SoC specific timer code from AG5EVM and Kota2 to sh73a0 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
parent
17254bffd6
commit
3be26fdba8
|
@ -46,7 +46,6 @@
|
||||||
#include <mach/common.h>
|
#include <mach/common.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/time.h>
|
|
||||||
#include <asm/hardware/gic.h>
|
#include <asm/hardware/gic.h>
|
||||||
#include <asm/hardware/cache-l2x0.h>
|
#include <asm/hardware/cache-l2x0.h>
|
||||||
#include <asm/traps.h>
|
#include <asm/traps.h>
|
||||||
|
@ -600,17 +599,6 @@ static void __init ag5evm_init(void)
|
||||||
platform_add_devices(ag5evm_devices, ARRAY_SIZE(ag5evm_devices));
|
platform_add_devices(ag5evm_devices, ARRAY_SIZE(ag5evm_devices));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init ag5evm_timer_init(void)
|
|
||||||
{
|
|
||||||
sh73a0_clock_init();
|
|
||||||
shmobile_timer.init();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct sys_timer ag5evm_timer = {
|
|
||||||
.init = ag5evm_timer_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
MACHINE_START(AG5EVM, "ag5evm")
|
MACHINE_START(AG5EVM, "ag5evm")
|
||||||
.map_io = sh73a0_map_io,
|
.map_io = sh73a0_map_io,
|
||||||
.init_early = sh73a0_add_early_devices,
|
.init_early = sh73a0_add_early_devices,
|
||||||
|
@ -618,5 +606,5 @@ MACHINE_START(AG5EVM, "ag5evm")
|
||||||
.init_irq = sh73a0_init_irq,
|
.init_irq = sh73a0_init_irq,
|
||||||
.handle_irq = gic_handle_irq,
|
.handle_irq = gic_handle_irq,
|
||||||
.init_machine = ag5evm_init,
|
.init_machine = ag5evm_init,
|
||||||
.timer = &ag5evm_timer,
|
.timer = &shmobile_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -513,17 +513,6 @@ static void __init kota2_init(void)
|
||||||
platform_add_devices(kota2_devices, ARRAY_SIZE(kota2_devices));
|
platform_add_devices(kota2_devices, ARRAY_SIZE(kota2_devices));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init kota2_timer_init(void)
|
|
||||||
{
|
|
||||||
sh73a0_clock_init();
|
|
||||||
shmobile_timer.init();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct sys_timer kota2_timer = {
|
|
||||||
.init = kota2_timer_init,
|
|
||||||
};
|
|
||||||
|
|
||||||
MACHINE_START(KOTA2, "kota2")
|
MACHINE_START(KOTA2, "kota2")
|
||||||
.map_io = sh73a0_map_io,
|
.map_io = sh73a0_map_io,
|
||||||
.init_early = sh73a0_add_early_devices,
|
.init_early = sh73a0_add_early_devices,
|
||||||
|
@ -531,5 +520,5 @@ MACHINE_START(KOTA2, "kota2")
|
||||||
.init_irq = sh73a0_init_irq,
|
.init_irq = sh73a0_init_irq,
|
||||||
.handle_irq = gic_handle_irq,
|
.handle_irq = gic_handle_irq,
|
||||||
.init_machine = kota2_init,
|
.init_machine = kota2_init,
|
||||||
.timer = &kota2_timer,
|
.timer = &shmobile_timer,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
#include <asm/mach/time.h>
|
||||||
|
|
||||||
static struct map_desc sh73a0_io_desc[] __initdata = {
|
static struct map_desc sh73a0_io_desc[] __initdata = {
|
||||||
/* create a 1:1 entity map for 0xe6xxxxxx
|
/* create a 1:1 entity map for 0xe6xxxxxx
|
||||||
|
@ -686,6 +687,12 @@ void __init sh73a0_add_standard_devices(void)
|
||||||
ARRAY_SIZE(sh73a0_late_devices));
|
ARRAY_SIZE(sh73a0_late_devices));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __init sh73a0_earlytimer_init(void)
|
||||||
|
{
|
||||||
|
sh73a0_clock_init();
|
||||||
|
shmobile_earlytimer_init();
|
||||||
|
}
|
||||||
|
|
||||||
void __init sh73a0_add_early_devices(void)
|
void __init sh73a0_add_early_devices(void)
|
||||||
{
|
{
|
||||||
early_platform_add_devices(sh73a0_early_devices,
|
early_platform_add_devices(sh73a0_early_devices,
|
||||||
|
@ -693,4 +700,7 @@ void __init sh73a0_add_early_devices(void)
|
||||||
|
|
||||||
/* setup early console here as well */
|
/* setup early console here as well */
|
||||||
shmobile_setup_console();
|
shmobile_setup_console();
|
||||||
|
|
||||||
|
/* override timer setup with soc-specific code */
|
||||||
|
shmobile_timer.init = sh73a0_earlytimer_init;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue