Skip to content

Commit

Permalink
ARM: sirf: move to debug_ll_io_init and drop map_io
Browse files Browse the repository at this point in the history
This patch moves to debug_ll_io_init(), then finally drops CSR map_io()
machine callbacks.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Barry Song authored and Barry Song committed Jan 20, 2015
1 parent a7ae982 commit 1805f4d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 41 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-prima2/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
obj-y += rstc.o
obj-y += common.o
obj-y += rtciobrg.o
obj-$(CONFIG_DEBUG_LL) += lluart.o
obj-$(CONFIG_SUSPEND) += pm.o sleep.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/mach-prima2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ static void __init sirfsoc_init_late(void)
sirfsoc_pm_init();
}

static __init void sirfsoc_map_io(void)
{
sirfsoc_map_lluart();
}

#ifdef CONFIG_ARCH_ATLAS6
static const char *atlas6_dt_match[] __initconst = {
"sirf,atlas6",
Expand All @@ -35,7 +30,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
.map_io = sirfsoc_map_io,
.init_late = sirfsoc_init_late,
.dt_compat = atlas6_dt_match,
MACHINE_END
Expand All @@ -51,7 +45,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
.map_io = sirfsoc_map_io,
.dma_zone_size = SZ_256M,
.init_late = sirfsoc_init_late,
.dt_compat = prima2_dt_match,
Expand Down
33 changes: 0 additions & 33 deletions arch/arm/mach-prima2/lluart.c

This file was deleted.

0 comments on commit 1805f4d

Please sign in to comment.