]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: Dove: fix second SPI initialization call
authorNicolas Pitre <nicolas.pitre@linaro.org>
Wed, 14 Sep 2011 05:22:05 +0000 (01:22 -0400)
committerArnd Bergmann <arnd@arndb.de>
Wed, 14 Sep 2011 12:31:43 +0000 (14:31 +0200)
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>
arch/arm/mach-dove/common.c

index 83dce859886dac5bbadf0ecdf92e047ab8582a28..a9e0dae86a26f52cccd241a686ae7555b83b48cd 100644 (file)
@@ -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());
 }
 
 /*****************************************************************************