diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-14 01:22:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:36 -0700 |
| commit | b7290a21efb472272306d64686efa523f7e93bf6 (patch) | |
| tree | b41c45626e601ea2c0fe1e0f6cd7e64fd4513fca /arch/arm | |
| parent | 562960c731b9ffba8cd200be8d38f5f793b23d74 (diff) | |
| download | kernel_samsung_tuna-b7290a21efb472272306d64686efa523f7e93bf6.zip kernel_samsung_tuna-b7290a21efb472272306d64686efa523f7e93bf6.tar.gz kernel_samsung_tuna-b7290a21efb472272306d64686efa523f7e93bf6.tar.bz2 | |
ARM: Dove: fix second SPI initialization call
commit 72cc205611879525db0374d9831f84f787112b25 upstream.
Commit 980f9f601a "ARM: orion: Consolidate SPI initialization."
broke it by overwriting the SPI0 registration.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm')
| -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 5ed51b8..cf7e598 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -160,7 +160,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()); } /***************************************************************************** |