lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
This commit is contained in:
Nicolas Pitre
2011-09-02 21:18:52 -04:00
committed by Nicolas Pitre
parent f431eb6960
commit 17dea45adb
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -365,6 +365,7 @@ config ARCH_PRIMA2
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select USE_OF select USE_OF
select ZONE_DMA select ZONE_DMA
select NO_MACH_MEMORY_H
help help
Support for CSR SiRFSoC ARM Cortex A9 Platform Support for CSR SiRFSoC ARM Cortex A9 Platform

14
arch/arm/mach-prima2/include/mach/memory.h
View File

@@ -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

5
arch/arm/mach-prima2/l2x0.c
View File

@@ -13,7 +13,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <mach/memory.h>
#define L2X0_ADDR_FILTERING_START 0xC00 #define L2X0_ADDR_FILTERING_START 0xC00
#define L2X0_ADDR_FILTERING_END 0xC04 #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 * 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); 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); sirfsoc_l2x_base + L2X0_ADDR_FILTERING_START);
writel_relaxed(0, writel_relaxed(0,