ARM: mach-prima2: remove mach/memory.h

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 322e48ce451c7319cacdc5393d0ae82589778d07..b30cf6437c99953204835b1062cb0c2174588353 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -365,6 +365,7 @@ config ARCH_PRIMA2
        select GENERIC_IRQ_CHIP
        select USE_OF
        select ZONE_DMA
+       select NO_MACH_MEMORY_H
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform
 

diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h
deleted file mode 100644 (file)
index 0d5ee6a..0000000
--- a/arch/arm/mach-prima2/include/mach/memory.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * arch/arm/mach-prima2/include/mach/memory.h
- *
- * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
-#endif

diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
index 9cda2057bcfbd10d19f8f9db364cfa9e3dd49f03..66c6387e5a04621b4ad31ff98f36cbb743599d8e 100644 (file)
--- a/arch/arm/mach-prima2/l2x0.c
+++ b/arch/arm/mach-prima2/l2x0.c
@@ -13,7 +13,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <asm/hardware/cache-l2x0.h>
-#include <mach/memory.h>
 
 #define L2X0_ADDR_FILTERING_START       0xC00
 #define L2X0_ADDR_FILTERING_END         0xC04
@@ -41,9 +40,9 @@ static int __init sirfsoc_of_l2x_init(void)
                /*
                 * set the physical memory windows L2 cache will cover
                 */
-               writel_relaxed(PLAT_PHYS_OFFSET + 1024 * 1024 * 1024,
+               writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024,
                        sirfsoc_l2x_base + L2X0_ADDR_FILTERING_END);
-               writel_relaxed(PLAT_PHYS_OFFSET | 0x1,
+               writel_relaxed(PHYS_OFFSET | 0x1,
                        sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
 
                writel_relaxed(0,