diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-19 22:29:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-19 22:29:17 -0800 |
| commit | 00b2fa57d50fde1f5d7c3ac0893e49d69c315414 (patch) | |
| tree | 1be51fdf49874ffb00407e72753394f2c081e7a1 /arch/arm/mach-davinci/board-dm355-leopard.c | |
| parent | a0c726cc2c174c935ca2c16c7201c4c82b1a8589 (diff) | |
| parent | ae41d17a76338ed4cb2ab2c7db2b5de9f9524609 (diff) | |
Merge tag 'davinci-for-v3.8/board' of git://gitorious.org/linux-davinci/linux-davinci into next/boards
From Sekhar Nori:
These changes add PRUSS support on DA850 EVM. There is also fixup
of include file ordering in the EVM file.
* tag 'davinci-for-v3.8/board' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850 evm: register uio_pruss device
ARM: davinci: da850 evm: clean up include ordering
ARM: davinci: da8xx: add DA850 PRUSS support
ARM: davinci: add platform hook to fetch the SRAM pool
ARM: davinci: da850: changed SRAM allocator to shared ram.
ARM: davinci: sram: switch from iotable to ioremapped regions
uio: uio_pruss: replace private SRAM API with genalloc
ARM: davinci: serial: provide API to initialze UART clocks
ARM: davinci: convert platform code to use clk_prepare/clk_unprepare
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm355-leopard.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm355-leopard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index 2f88103c6459..d41954507fc2 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c @@ -246,7 +246,7 @@ static __init void dm355_leopard_init(void) if (IS_ERR(aemif)) WARN("%s: unable to get AEMIF clock\n", __func__); else - clk_enable(aemif); + clk_prepare_enable(aemif); platform_add_devices(davinci_leopard_devices, ARRAY_SIZE(davinci_leopard_devices)); |