* [PATCH 02/08] sh: Convert sh7366 to mem_init
@ 2011-01-06 10:16 Magnus Damm
0 siblings, 0 replies; only message in thread
From: Magnus Damm @ 2011-01-06 10:16 UTC (permalink / raw)
To: linux-sh
From: Magnus Damm <damm@opensource.se>
Convert sh7366 to use shmobile_memchunk_setup().
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/sh/include/cpu-sh4/cpu/sh7366.h | 6 ++++++
arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 13 +++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
--- /dev/null
+++ work/arch/sh/include/cpu-sh4/cpu/sh7366.h 2011-01-06 18:33:25.000000000 +0900
@@ -0,0 +1,6 @@
+#ifndef __ASM_SH7366_H__
+#define __ASM_SH7366_H__
+
+void sh7366_mem_init(void);
+
+#endif /* __ASM_SH7366_H__ */
--- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ work/arch/sh/kernel/cpu/sh4a/setup-sh7366.c 2011-01-06 18:33:35.000000000 +0900
@@ -17,6 +17,7 @@
#include <linux/sh_timer.h>
#include <linux/usb/r8a66597.h>
#include <asm/clock.h>
+#include <cpu/sh7366.h>
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xffe00000,
@@ -294,10 +295,6 @@ static struct platform_device *sh7366_de
static int __init sh7366_devices_setup(void)
{
- platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);
- platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20);
- platform_resource_setup_memory(&veu1_device, "veu1", 2 << 20);
-
return platform_add_devices(sh7366_devices,
ARRAY_SIZE(sh7366_devices));
}
@@ -317,6 +314,14 @@ void __init plat_early_device_setup(void
ARRAY_SIZE(sh7366_early_devices));
}
+void __init sh7366_mem_init(void)
+{
+ generic_mem_init();
+ shmobile_memchunk_setup(&vpu_device, "vpu", 2 << 20);
+ shmobile_memchunk_setup(&veu0_device, "veu0", 2 << 20);
+ shmobile_memchunk_setup(&veu1_device, "veu1", 2 << 20);
+}
+
enum {
UNUSED=0,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-06 10:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-06 10:16 [PATCH 02/08] sh: Convert sh7366 to mem_init Magnus Damm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).