diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 17:03:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 17:03:16 -0800 |
| commit | 13c5d51953441bd03cfd057e8f340100516ef24c (patch) | |
| tree | fc574e5468ab732da3bd20c54aaefa2d1b7f4636 /arch/arm/mach-at91 | |
| parent | 5b22c33e8e52ea0e2530037da1f97e88c0b42214 (diff) | |
| parent | ce3b2630fd4737a3f9aa9119d40647a9ac7baa38 (diff) | |
| download | linux-13c5d51953441bd03cfd057e8f340100516ef24c.tar.gz linux-13c5d51953441bd03cfd057e8f340100516ef24c.tar.bz2 linux-13c5d51953441bd03cfd057e8f340100516ef24c.zip | |
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
Update to DT files for AT91:
- adding the watchdog to Animeo IP board
- some more DT support for at91rm9200 peripherals
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91: add EMAC bindings to RM9200 DT
ARM: at91: add SSC bindings to RM9200 DT
ARM: at91: add MMC bindings to RM9200 DT
ARM: at91: Animeo IP: enable watchdog support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 7aeb473ee539..9706c000f294 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -210,6 +210,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "fffa4000.timer", &tc3_clk), CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk), + CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk), + CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", ðer_clk), CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk), CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), |