redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: 6946/1: vexpress: move v2m clock init to init_early 

Commit 7ff550de99 breaks vexpress booting. The
v2m clock table needs to be setup in init_early before the timer
initialization occurs.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
hifive-unleashed-5.1
Rob Herring 2011-05-30 19:44:22 +01:00 committed by Russell King
parent 1fa7b6a29c
commit 2fdf99934c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-vexpress/v2m.c
View File

@ -46,12 +46,6 @@ static struct map_desc v2m_io_desc[] __initdata = {
},
};
static void __init v2m_init_early(void)
{
ct_desc->init_early();
versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
}
static void __init v2m_timer_init(void)
{
u32 scctrl;
@ -365,6 +359,13 @@ static struct clk_lookup v2m_lookups[] = {
},
};
static void __init v2m_init_early(void)
{
ct_desc->init_early();
clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
}
static void v2m_power_off(void)
{
if (v2m_cfg_write(SYS_CFG_SHUTDOWN | SYS_CFG_SITE_MB, 0))
@ -418,8 +419,6 @@ static void __init v2m_init(void)
{
int i;
clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
platform_device_register(&v2m_pcie_i2c_device);
platform_device_register(&v2m_ddc_i2c_device);
platform_device_register(&v2m_flash_device);