diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 01:27:13 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 01:27:13 (GMT) |
| commit | 93ce285503e375a4a751b632dd7b93291629c5cd (patch) | |
| tree | 83ddfe4de81a87f9fecae220782a28ae340864c1 /arch/arm/mach-davinci/da8xx-dt.c | |
| parent | 13c5d51953441bd03cfd057e8f340100516ef24c (diff) | |
| parent | 19c7c0d81a9b1fe7342d0208b629b5e085e4f3ae (diff) | |
| download | linux-fsl-qoriq-93ce285503e375a4a751b632dd7b93291629c5cd.tar.xz | |
Merge tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
From Sekhar Nori:
Second round of DT updates for DaVinci.
This pull request adds support for I2C0 and watchdog timer
for DA850 EVM booting using device tree. It also enables
machine reboot when using device tree.
* tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850 DT: add support for machine reboot
ARM: davinci: da850: add wdt DT node
ARM: davinci: da850: add DT node for I2C0
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
| -rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 9a7c76e..6b7a0a2 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -37,11 +37,18 @@ static void __init da8xx_init_irq(void) of_irq_init(da8xx_irq_match); } +struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL), + OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL), + {} +}; + #ifdef CONFIG_ARCH_DAVINCI_DA850 static void __init da850_init_machine(void) { - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + of_platform_populate(NULL, of_default_bus_match_table, + da850_auxdata_lookup, NULL); da8xx_uart_clk_enable(); } |