| Date | Wed, 28 Sep 2011 15:01:45 -0700 | From | Greg KH <> | Subject | [141/244] ARM: Dove: fix second SPI initialization call |
| |
3.0-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nicolas Pitre <nicolas.pitre@linaro.org>
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>
--- arch/arm/mach-dove/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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()); } /*****************************************************************************
|