summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 10:12:49 +0100
committerOlof Johansson <olof@lixom.net>2012-11-21 11:13:12 +0100
commita33ee3e6949e244f9166a7f7e764886432304ecd (patch)
tree257ae924259d68bea516f833c9728d596e7757b5 /arch/arm/mm
parentMerge branch 'vexpress-clk-soc' of git://git.linaro.org/people/pawelmoll/linu... (diff)
parentARM: highbank: use common debug_ll_io_init (diff)
downloadlinux-a33ee3e6949e244f9166a7f7e764886432304ecd.tar.xz
linux-a33ee3e6949e244f9166a7f7e764886432304ecd.zip
Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc
From Rob Herring: Use common debug_ll_init function and remove the static mapping code from mach-highbank. * tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux: ARM: highbank: use common debug_ll_io_init ARM: implement debug_ll_io_init()
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/mmu.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 941dfb9e9a78..39719bb93caa 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -876,6 +876,22 @@ static void __init pci_reserve_io(void)
#define pci_reserve_io() do { } while (0)
#endif
+#ifdef CONFIG_DEBUG_LL
+void __init debug_ll_io_init(void)
+{
+ struct map_desc map;
+
+ debug_ll_addr(&map.pfn, &map.virtual);
+ if (!map.pfn || !map.virtual)
+ return;
+ map.pfn = __phys_to_pfn(map.pfn);
+ map.virtual &= PAGE_MASK;
+ map.length = PAGE_SIZE;
+ map.type = MT_DEVICE;
+ create_mapping(&map);
+}
+#endif
+
static void * __initdata vmalloc_min =
(void *)(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET);