Skip to content

Commit

Permalink
ARM: picoxcell: move io mappings to common.c
Browse files Browse the repository at this point in the history
Now that we have lost our machine specific ioremap() we just have one
mapping that covers all peripherals.  Move this to common.c to simplify
things a little.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
  • Loading branch information
Jamie Iles committed Dec 18, 2011
1 parent 98e27a5 commit 8f37a0b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 34 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-picoxcell/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
obj-y := common.o
obj-y += time.o
obj-y += io.o
13 changes: 13 additions & 0 deletions arch/arm/mach-picoxcell/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-picoxcell/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
32 changes: 0 additions & 32 deletions arch/arm/mach-picoxcell/io.c

This file was deleted.

0 comments on commit 8f37a0b

Please sign in to comment.