From c029f83899d95decbee1934558eb8a7716ea6936 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 5 Jun 2014 17:43:38 +0400 Subject: [PATCH] ARM: clps711x: Prepare common init function to DT support Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/clep7212/lowlevel.c | 2 +- arch/arm/mach-clps711x/include/mach/clps711x.h | 2 +- arch/arm/mach-clps711x/lowlevel.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c index 92fbb9b53..ac715065f 100644 --- a/arch/arm/boards/clep7212/lowlevel.c +++ b/arch/arm/boards/clep7212/lowlevel.c @@ -24,5 +24,5 @@ void __naked __bare_init barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT); + clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT, NULL); } diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h index cc65cc85f..f4a1f0ade 100644 --- a/arch/arm/mach-clps711x/include/mach/clps711x.h +++ b/arch/arm/mach-clps711x/include/mach/clps711x.h @@ -281,6 +281,6 @@ #define MEMCFG_WAITSTATE_2_0 (14 << 2) #define MEMCFG_WAITSTATE_1_0 (15 << 2) -void clps711x_barebox_entry(u32); +void clps711x_barebox_entry(u32, void *); #endif diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c index 93a64a11c..ff23b05cc 100644 --- a/arch/arm/mach-clps711x/lowlevel.c +++ b/arch/arm/mach-clps711x/lowlevel.c @@ -17,7 +17,7 @@ #include -void __naked __bare_init clps711x_barebox_entry(u32 pllmult) +void __naked __bare_init clps711x_barebox_entry(u32 pllmult, void *data) { u32 cpu, bus; @@ -69,5 +69,5 @@ void __naked __bare_init clps711x_barebox_entry(u32 pllmult) /* Disable LED flasher */ writew(0, LEDFLSH); - barebox_arm_entry(SDRAM0_BASE, SZ_8M, NULL); + barebox_arm_entry(SDRAM0_BASE, SZ_8M, data); }