diff options
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 3535262848..5c4c2478cf 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -5,17 +5,10 @@ */ #include <common.h> -#include <init.h> #include <io.h> - -#include <linux/clk.h> -#include <linux/clkdev.h> -#include <linux/amba/bus.h> - -#include <asm/hardware/arm_timer.h> #include <asm/hardware/sp810.h> - -#include <mach/devices.h> +#include <mach/vexpress/devices.h> +#include <mach/vexpress/vexpress.h> void __iomem *v2m_sysreg_base; @@ -23,8 +16,7 @@ static void v2m_sysctl_init(void __iomem *base) { u32 scctrl; - if (WARN_ON(!base)) - return; + v2m_sysreg_base = base; /* Select 1MHz TIMCLK as the reference clock for SP804 timers */ scctrl = readl(base + SCCTRL); @@ -35,14 +27,12 @@ static void v2m_sysctl_init(void __iomem *base) void vexpress_a9_legacy_init(void) { - v2m_wdt_base = IOMEM(0x1000f000); - v2m_sysreg_base = IOMEM(0x10001000); v2m_sysctl_init(IOMEM(0x10001000)); + vexpress_restart_register_feature(IOMEM(0x1000f000)); } void vexpress_init(void) { - v2m_wdt_base = IOMEM(0x1c0f0000); - v2m_sysreg_base = IOMEM(0x1c020000); v2m_sysctl_init(IOMEM(0x1c020000)); + vexpress_restart_register_feature(IOMEM(0x1c0f0000)); } |