Commit 17dea45a authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

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



Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent f431eb69

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-prima2/include/mach/memory.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * 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

arch/arm/mach-prima2/l2x0.c

+2 −3
Original line number Diff line number Diff line
@@ -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,