ARM/VExpress: fix timer address for TC2 and other VExpress models

Message ID 1385475651-17038-1-git-send-email-andre.przywara@linaro.org
State New
Headers show

Commit Message

Andre Przywara Nov. 26, 2013, 2:20 p.m.
Commit v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since
the hardcoded value for SP804 timer address is wrong on Versatile
Express boards using the extended memory map.
Replace this value with an existing macro make it work on both sets of
machines.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
---
 include/configs/vexpress_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ian Campbell Nov. 30, 2013, 9:20 a.m. | #1
On Tue, 2013-11-26 at 15:20 +0100, Andre Przywara wrote:
> Commit v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since
> the hardcoded value for SP804 timer address is wrong on Versatile
> Express boards using the extended memory map.
> Replace this value with an existing macro make it work on both sets of
> machines.
> 
> Signed-off-by: Andre Przywara <andre.przywara@linaro.org>

I sent out a similar patch a couple of weeks back:
http://lists.denx.de/pipermail/u-boot/2013-November/167316.html

I don't mind which one goes in, so for this one:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

Thanks,
Ian.

> ---
>  include/configs/vexpress_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
> index 6da5e8f..7e78f8a 100644
> --- a/include/configs/vexpress_common.h
> +++ b/include/configs/vexpress_common.h
> @@ -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 */

Patch

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 6da5e8f..7e78f8a 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -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 */