From b10f1c836c4e8c2372d14953a17aa5b9744eb55c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 11 Jul 2014 13:00:37 +0200 Subject: [PATCH] ARM: pxa: Move UNCACHED_PHYS_0 mapping from generic.c to pxa2[57]x.c The UNCACHED_PHYS_0 mapping is only needed on PXA25x and PXA27x platforms. Move it to pxa25x.c and pxa27x.c to avoid wasting vmalloc space on PXA3xx. Signed-off-by: Laurent Pinchart Acked-by: Nicolas Pitre Signed-off-by: Olof Johansson --- arch/arm/mach-pxa/generic.c | 5 ----- arch/arm/mach-pxa/pxa25x.c | 5 +++++ arch/arm/mach-pxa/pxa27x.c | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 68a75fe16020..b31e101cad9b 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -83,11 +83,6 @@ static struct map_desc common_io_desc[] __initdata = { .pfn = __phys_to_pfn(PERIPH_PHYS), .length = PERIPH_SIZE, .type = MT_DEVICE - }, { /* UNCACHED_PHYS_0 */ - .virtual = UNCACHED_PHYS_0, - .pfn = __phys_to_pfn(0x00000000), - .length = UNCACHED_PHYS_0_SIZE, - .type = MT_DEVICE } }; diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 926c506f99bc..66e4a2b6316e 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -333,6 +333,11 @@ static struct map_desc pxa25x_io_desc[] __initdata = { .pfn = __phys_to_pfn(PXA2XX_SMEMC_BASE), .length = SMEMC_SIZE, .type = MT_DEVICE + }, { /* UNCACHED_PHYS_0 */ + .virtual = UNCACHED_PHYS_0, + .pfn = __phys_to_pfn(0x00000000), + .length = UNCACHED_PHYS_0_SIZE, + .type = MT_DEVICE }, }; diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 440564458767..6cc0f4656d10 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -409,6 +409,11 @@ static struct map_desc pxa27x_io_desc[] __initdata = { .pfn = __phys_to_pfn(IMEMC_PHYS), .length = IMEMC_SIZE, .type = MT_DEVICE + }, { /* UNCACHED_PHYS_0 */ + .virtual = UNCACHED_PHYS_0, + .pfn = __phys_to_pfn(0x00000000), + .length = UNCACHED_PHYS_0_SIZE, + .type = MT_DEVICE }, }; -- 2.20.1