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

ARM: integrator: delete static core module mappings

Browse Source 
Now that the core module base is taken from the device tree
both for platform initialization and cpufreq, let's delete
the static mappings.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2013-06-17 23:34:27 +02:00
parent dc1ccc4815
commit 78d1632183
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-integrator/integrator_ap.c
View File

@@ -64,6 +64,7 @@
/* Base address to the AP system controller */ /* Base address to the AP system controller */
void __iomem *ap_syscon_base; void __iomem *ap_syscon_base;
/* /*
* All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
* is the (PA >> 12). * is the (PA >> 12).
@@ -73,12 +74,10 @@ void __iomem *ap_syscon_base;
*/ */
#define VA_IC_BASE __io_address(INTEGRATOR_IC_BASE) #define VA_IC_BASE __io_address(INTEGRATOR_IC_BASE)
#define VA_EBI_BASE __io_address(INTEGRATOR_EBI_BASE) #define VA_EBI_BASE __io_address(INTEGRATOR_EBI_BASE)
#define VA_CMIC_BASE __io_address(INTEGRATOR_HDR_IC)
/* /*
* Logical Physical * Logical Physical
* ef000000 Cache flush * ef000000 Cache flush
* f1000000 10000000 Core module registers
* f1100000 11000000 System controller registers * f1100000 11000000 System controller registers
* f1200000 12000000 EBI registers * f1200000 12000000 EBI registers
* f1300000 13000000 Counter/Timer * f1300000 13000000 Counter/Timer
@@ -91,11 +90,6 @@ void __iomem *ap_syscon_base;
static struct map_desc ap_io_desc[] __initdata __maybe_unused = { static struct map_desc ap_io_desc[] __initdata __maybe_unused = {
{ {
.virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE),
.pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE),
.length = SZ_4K,
.type = MT_DEVICE
}, {
.virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE), .virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE),
.pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE),
.length = SZ_4K, .length = SZ_4K,

8
arch/arm/mach-integrator/integrator_cp.c
View File

@@ -64,8 +64,6 @@ static void __iomem *intcp_con_base;
/* /*
* Logical Physical * Logical Physical
* f1000000 10000000 Core module registers
* f1100000 11000000 System controller registers
* f1200000 12000000 EBI registers * f1200000 12000000 EBI registers
* f1300000 13000000 Counter/Timer * f1300000 13000000 Counter/Timer
* f1400000 14000000 Interrupt controller * f1400000 14000000 Interrupt controller
@@ -74,16 +72,10 @@ static void __iomem *intcp_con_base;
* f1a00000 1a000000 Debug LEDs * f1a00000 1a000000 Debug LEDs
* fc900000 c9000000 GPIO * fc900000 c9000000 GPIO
* fca00000 ca000000 SIC * fca00000 ca000000 SIC
* fcb00000 cb000000 CP system control
*/ */
static struct map_desc intcp_io_desc[] __initdata __maybe_unused = { static struct map_desc intcp_io_desc[] __initdata __maybe_unused = {
{ {
.virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE),
.pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE),
.length = SZ_4K,
.type = MT_DEVICE
}, {
.virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE), .virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE),
.pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE),
.length = SZ_4K, .length = SZ_4K,