summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-06-05 17:43:38 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-06-06 06:35:43 +0200
commitc029f83899d95decbee1934558eb8a7716ea6936 (patch)
tree9d119074baadf7f10f9532a5d0a44412f4090014 /arch/arm/mach-clps711x
parent905d36b841574934417d5934857cad93f3ce798e (diff)
downloadbarebox-c029f83899d95decbee1934558eb8a7716ea6936.tar.gz
barebox-c029f83899d95decbee1934558eb8a7716ea6936.tar.xz
ARM: clps711x: Prepare common init function to DT support
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r--arch/arm/mach-clps711x/include/mach/clps711x.h2
-rw-r--r--arch/arm/mach-clps711x/lowlevel.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h
index cc65cc85f9..f4a1f0aded 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 93a64a11c0..ff23b05cce 100644
--- a/arch/arm/mach-clps711x/lowlevel.c
+++ b/arch/arm/mach-clps711x/lowlevel.c
@@ -17,7 +17,7 @@
#include <mach/clps711x.h>
-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);
}