diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:23:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:26:44 -0800 |
| commit | 3d7b2c6087d011df3213d286b034f5716eae3209 (patch) | |
| tree | 744fb00e8311f6026ba2abbdce0b594f5aab595e /arch/arm/mach-davinci/board-mityomapl138.c | |
| parent | 0475e57fc392484b1f39f3f757b8ad5314964eb4 (diff) | |
| parent | 09810a853b9a7920ba8c250d18815ef236effc47 (diff) | |
Merge tag 'davinci-for-v3.9/soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
From Sekhar Nori:
DaVinci SoC changes for v3.9
This pull request:
1) Fixes a bug with the way SPI devices were registered on DA850
2) Adds support for DSP clock and resetting the DSP on DA850
3) Fixes checkpatch issue with some existing files.
* tag 'davinci-for-v3.9/soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850: add dsp clock definition
ARM: davinci: psc: introduce reset API
ARM: davinci: psc.c: change pr_warning() to pr_warn()
ARM: davinci: devices-da8xx.c: change pr_warning() to pr_warn()
ARM: davinci: da8xx_register_spi() should not register SPI board info
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/board-mityomapl138.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-mityomapl138.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index b0df578bf744..9549d53aa63f 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -529,8 +529,13 @@ static void __init mityomapl138_init(void) mityomapl138_setup_nand(); - ret = da8xx_register_spi(1, mityomapl138_spi_flash_info, - ARRAY_SIZE(mityomapl138_spi_flash_info)); + ret = spi_register_board_info(mityomapl138_spi_flash_info, + ARRAY_SIZE(mityomapl138_spi_flash_info)); + if (ret) + pr_warn("spi info registration failed: %d\n", ret); + + ret = da8xx_register_spi_bus(1, + ARRAY_SIZE(mityomapl138_spi_flash_info)); if (ret) pr_warning("spi 1 registration failed: %d\n", ret); |