---

yaml --- r: 281544 b: refs/heads/master c: 8f37a0b h: refs/heads/master v: v3
git-mirror · Dec 18, 2011 · 7d5499b · 7d5499b
1 parent a52f138
commit 7d5499b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 35 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e27a5c13badb5c56d9d1d6c8ec210753ac1195
+refs/heads/master: 8f37a0b49656ed961598351da3ebdd89f2d2e5b4
diff --git a/trunk/arch/arm/mach-picoxcell/Makefile b/trunk/arch/arm/mach-picoxcell/Makefile
@@ -1,3 +1,2 @@
 obj-y	:= common.o
 obj-y	+= time.o
-obj-y	+= io.o
diff --git a/trunk/arch/arm/mach-picoxcell/common.c b/trunk/arch/arm/mach-picoxcell/common.c
@@ -16,12 +16,25 @@
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
+#include <asm/mach/map.h>
 
 #include <mach/map.h>
 #include <mach/picoxcell_soc.h>
 
 #include "common.h"
 
+static struct map_desc io_map __initdata = {
+	.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
+	.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
+	.length		= PICOXCELL_PERIPH_LENGTH,
+	.type		= MT_DEVICE,
+};
+
+static void __init picoxcell_map_io(void)
+{
+	iotable_init(&io_map, 1);
+}
+
 static void __init picoxcell_init_machine(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

diff --git a/trunk/arch/arm/mach-picoxcell/common.h b/trunk/arch/arm/mach-picoxcell/common.h
@@ -13,6 +13,5 @@
 #include <asm/mach/time.h>
 
 extern struct sys_timer picoxcell_timer;
-extern void picoxcell_map_io(void);
 
 #endif /* __PICOXCELL_COMMON_H__ */
diff --git a/trunk/arch/arm/mach-picoxcell/io.c b/trunk/arch/arm/mach-picoxcell/io.c