Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 608914b3 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: integrator: restore static map on the CP 



Commit 78d16321 deleted the
static mappings of the core modules, but this static map is
still needed on the Integrator/CP (not the Integrator/AP).

Restore the static map on the Integrator/CP.

Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 9d2a5e20

arch/arm/mach-integrator/integrator_cp.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ static void __iomem *intcp_con_base; 




/*

/*

 * Logical      Physical

 * Logical      Physical

 * f1000000	10000000	Core module registers

 * f1300000	13000000	Counter/Timer

 * f1300000	13000000	Counter/Timer

 * f1400000	14000000	Interrupt controller

 * f1400000	14000000	Interrupt controller

 * f1600000	16000000	UART 0

 * f1600000	16000000	UART 0
@@ -75,6 +76,11 @@ static void __iomem *intcp_con_base; 




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_CT_BASE),

		.virtual	= IO_ADDRESS(INTEGRATOR_CT_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),

		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),

		.length		= SZ_4K,

		.length		= SZ_4K,