Skip to contentSkip to conversation

vexpress: fix timer address on non-A9 platforms

PATCH New Marc Zyngier 2 participants 3 messages Dec 7, 2013 – Dec 9, 2013 Arm/versatile express platform

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vexpress: fix timer address on non-A9 platforms

Commit b3a7f22b3e09 (ARM: vexpress: convert to common timer code) converted the VE timer code to the generic framework, but hardcoded the timer address of the A9 testchip.

Change it for the appropriate macro that works on both core tiles.

---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/vexpress_common.h +1 -1
index 6da5e8f..7e78f8a 100644
@@ -132,7 +132,7 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN	(1 << 0)
 
 #define CONFIG_SYS_TIMER_RATE		1000000
-#define CONFIG_SYS_TIMER_COUNTER	(0x10011000 + 0x4)
+#define CONFIG_SYS_TIMER_COUNTER	(V2M_TIMER01 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /* SMSC9115 Ethernet from SMSC9118 family */
Signature · 1 line
1.8.4.3
#1 lore raw

PATCH 1/1 vexpress: fix timer address on non-A9 platforms

Quoted 10 lines · Marc Zyngier

Commit b3a7f22b3e09 (ARM: vexpress: convert to common timer code) converted the VE timer code to the generic framework, but hardcoded the timer address of the A9 testchip.

Change it for the appropriate macro that works on both core tiles.

---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for fixing my crap code. Andre and Ian already posted fixes for this.

http://patchwork.ozlabs.org/patch/294336/

Rob

Quoted 21 lines
include/configs/vexpress_common.h +1 -2
index 6da5e8f..7e78f8a 100644
@@ -132,7 +132,7 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
 
 #define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       (0x10011000 + 0x4)
+#define CONFIG_SYS_TIMER_COUNTER       (V2M_TIMER01 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 /* SMSC9115 Ethernet from SMSC9118 family */
--

1.8.4.3

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#2 lore raw

PATCH 1/1 vexpress: fix timer address on non-A9 platforms

Quoted 7 lines · Rob Herring
Quoted 6 lines · Marc Zyngier

Commit b3a7f22b3e09 (ARM: vexpress: convert to common timer code) converted the VE timer code to the generic framework, but hardcoded the timer address of the A9 testchip.

Change it for the appropriate macro that works on both core tiles.

Quoted 8 lines
Quoted 4 lines
---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for fixing my crap code. Andre and Ian already posted fixes for this.

http://patchwork.ozlabs.org/patch/294336/

Ah! My bad for not noticing it. Hopefully this will get merged soon enough...

Cheers,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...