diff options
| author |   Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-14 01:22:05 -0400 |
|---|---|---|
| committer |   Arnd Bergmann <arnd@arndb.de> | 2011-09-14 14:31:43 +0200 |
| commit | 72cc205611879525db0374d9831f84f787112b25 (patch) | |
| tree | 331dfb7df5edb4636db1eb391fe8ecb8cc8185d9 /arch/arm/mach-dove | |
| parent | Linux 3.1-rc6 (diff) | |
| download | linux-dev-72cc205611879525db0374d9831f84f787112b25.tar.xz linux-dev-72cc205611879525db0374d9831f84f787112b25.zip | |
ARM: Dove: fix second SPI initialization call
Commit 980f9f601a "ARM: orion: Consolidate SPI initialization."
broke it by overwriting the SPI0 registration.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-dove')
| -rw-r--r-- | arch/arm/mach-dove/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 83dce859886d..a9e0dae86a26 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -158,7 +158,7 @@ void __init dove_spi0_init(void) void __init dove_spi1_init(void) { - orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk()); + orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk()); } /***************************************************************************** |