Skip to content

Commit

Permalink
ARM: highbank: use common debug_ll_io_init
Browse files Browse the repository at this point in the history
Remove the platform static mapping code for uart and use the common
debug_ll_io_init function.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
  • Loading branch information
Rob Herring committed Nov 8, 2012
1 parent d3ad4a6 commit 5253034
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 46 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-highbank/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ obj-y := highbank.o system.o smc.o
plus_sec := $(call as-instr,.arch_extension sec,+sec)
AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec)

obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_PM_SLEEP) += pm.o
5 changes: 0 additions & 5 deletions arch/arm/mach-highbank/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
extern void highbank_clocks_init(void);
extern void highbank_restart(char, const char *);
extern void __iomem *scu_base_addr;
#ifdef CONFIG_DEBUG_HIGHBANK_UART
extern void highbank_lluart_map_io(void);
#else
static inline void highbank_lluart_map_io(void) {}
#endif

#ifdef CONFIG_PM_SLEEP
extern void highbank_pm_init(void);
Expand Down
8 changes: 2 additions & 6 deletions arch/arm/mach-highbank/highbank.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <asm/hardware/gic.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>

#include "core.h"
Expand All @@ -53,11 +54,6 @@ static void __init highbank_scu_map_io(void)
scu_base_addr = ioremap(base, SZ_4K);
}

static void __init highbank_map_io(void)
{
highbank_lluart_map_io();
}

#define HB_JUMP_TABLE_PHYS(cpu) (0x40 + (0x10 * (cpu)))
#define HB_JUMP_TABLE_VIRT(cpu) phys_to_virt(HB_JUMP_TABLE_PHYS(cpu))

Expand Down Expand Up @@ -211,7 +207,7 @@ static const char *highbank_match[] __initconst = {

DT_MACHINE_START(HIGHBANK, "Highbank")
.smp = smp_ops(highbank_smp_ops),
.map_io = highbank_map_io,
.map_io = debug_ll_io_init,
.init_irq = highbank_init_irq,
.timer = &highbank_timer,
.handle_irq = gic_handle_irq,
Expand Down
34 changes: 0 additions & 34 deletions arch/arm/mach-highbank/lluart.c

This file was deleted.

0 comments on commit 5253034

Please sign in to comment.