Skip to contentSkip to conversation

ARM: integrator: restore static map on the CP

PATCH New Linus Walleij 2 participants 2 messages Jan 24, 2014 – Jan 31, 2014

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 1/1 ARM: integrator: restore static map on the CP

Commit 78d1632183454dba46ca8295484a5e7603acdc18 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 Will Deacon <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

---
ARM SoC folks: please apply this fix directly to ARM SoC if you're OK with it.

---
 arch/arm/mach-integrator/integrator_cp.c | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/mach-integrator/integrator_cp.c +6 -0
index 5e84149d1790..a3ef961e4a93 100644
@@ -64,6 +64,7 @@ static void __iomem *intcp_con_base;
 
 /*
  * Logical      Physical
+ * f1000000	10000000	Core module registers
  * f1300000	13000000	Counter/Timer
  * f1400000	14000000	Interrupt controller
  * f1600000	16000000	UART 0

@@ -75,6 +76,11 @@ static void __iomem *intcp_con_base;
 
 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),
 		.pfn		= __phys_to_pfn(INTEGRATOR_CT_BASE),
 		.length		= SZ_4K,
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH 1/1 ARM: integrator: restore static map on the CP

Quoted 11 lines · Linus Walleij

Commit 78d1632183454dba46ca8295484a5e7603acdc18 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 Will Deacon <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

---
ARM SoC folks: please apply this fix directly to ARM SoC if you're OK with it.

Queuing for fixes.

Kevin