diff options
| author | Arnd Bergmann | 2012-03-16 20:51:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-03-16 20:51:30 +0100 |
| commit | d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3 (patch) | |
| tree | 5b91923fb5031c6963a60ee33ee7671d178f26b2 /arch/arm/mach-highbank/highbank.c | |
| parent | Merge branch 'at91-3.4-cleanup2-DT2+USB' of git://github.com/at91linux/linux-... (diff) | |
| parent | ARM: ux500: Provide local timer support for Device Tree (diff) | |
| download | kernel-qcow2-linux-d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3.tar.gz kernel-qcow2-linux-d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3.tar.xz kernel-qcow2-linux-d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3.zip | |
Merge branch 'ux500/dt' into next/dt2
* ux500/dt:
ARM: ux500: Provide local timer support for Device Tree
ARM: ux500: Enable PL022 SSP Controller in Device Tree
ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree
ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree
ARM: ux500: db8500: list most devices in the snowball device tree
ARM: ux500: split dts file for snowball into generic part
ARM: ux500: combine the board init functions for DT boot
ARM: ux500: Initial Device Tree support for Snowball
ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
ARM: ux500: fix compilation after local timer rework
(adds dependency on localtimer branch, irqdomain branch and ux500/soc
branch)
Conflicts:
arch/arm/mach-ux500/devices-common.c
This adds patches from Lee Jones, Niklas Hernaeus and myself to provide
initial device tree support on the ux500 platform. The pull request from
Lee contained some other changes, so I rebased the patches on top of
the branches that are actually dependencies for this.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 8394d512a402..bb1684f9b68b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -27,6 +27,7 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include <asm/smp_scu.h> +#include <asm/smp_twd.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/timer-sp.h> #include <asm/hardware/gic.h> @@ -111,6 +112,8 @@ static void __init highbank_timer_init(void) sp804_clocksource_init(timer_base + 0x20, "timer1"); sp804_clockevents_init(timer_base, irq, "timer0"); + + twd_local_timer_of_register(); } static struct sys_timer highbank_timer = { |