diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 17:19:17 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 17:19:17 -0400 |
| commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
| tree | 72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/mach-ux500/timer.c | |
| parent | f7b967bffefe69f1ad8b79e263237ec1feba7b9b (diff) | |
| parent | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee (diff) | |
Merge branch 'next/soc' into HEAD
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 66e7f00884ab..6f39731951b0 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c | |||
| @@ -54,7 +54,7 @@ static void __init ux500_timer_init(void) | |||
| 54 | void __iomem *tmp_base; | 54 | void __iomem *tmp_base; |
| 55 | struct device_node *np; | 55 | struct device_node *np; |
| 56 | 56 | ||
| 57 | if (cpu_is_u8500_family()) { | 57 | if (cpu_is_u8500_family() || cpu_is_ux540_family()) { |
| 58 | mtu_timer_base = __io_address(U8500_MTU0_BASE); | 58 | mtu_timer_base = __io_address(U8500_MTU0_BASE); |
| 59 | prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); | 59 | prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); |
| 60 | } else { | 60 | } else { |