[PATCH 1/8] ARM: vexpress: Simplify sysctl initialization

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <eagle.alexander923 at gmail.com>
---
 arch/arm/mach-vexpress/v2m.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 3535262848..c60e9dbd75 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -5,16 +5,8 @@
  */
 
 #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>
 
 void __iomem *v2m_sysreg_base;
@@ -23,8 +15,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);
@@ -36,13 +27,11 @@ 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));
 }
 
 void vexpress_init(void)
 {
 	v2m_wdt_base = IOMEM(0x1c0f0000);
-	v2m_sysreg_base = IOMEM(0x1c020000);
 	v2m_sysctl_init(IOMEM(0x1c020000));
 }
-- 
2.32.0