| Message ID | 1386414702-8498-1-git-send-email-marc.zyngier@arm.com |
|---|---|
| State | Superseded |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
On Sat, Dec 7, 2013 at 5:11 AM, Marc Zyngier <marc.zyngier@arm.com> wrote: > 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. > > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > --- > 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 > > 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 */ > -- > 1.8.4.3 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On 07/12/13 21:03, Rob Herring wrote: > On Sat, Dec 7, 2013 at 5:11 AM, Marc Zyngier <marc.zyngier@arm.com> wrote: >> 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. >> >> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> >> --- >> 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.
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 */
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. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/configs/vexpress_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)