at91sam9260/afeb9260: Fix SPI initialization
authorAlbin Tonnerre <albin.tonnerre@free-electrons.com>
Tue, 1 Sep 2009 09:26:20 +0000 (11:26 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Tue, 1 Sep 2009 20:10:10 +0000 (22:10 +0200)
Commit 7ebafb7ec1a0285af8380623c009576f92583b98 introduced a mistake in the spi
init function call for those boards. This patch fixes this.

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
board/afeb9260/afeb9260.c
board/atmel/at91sam9260ek/at91sam9260ek.c

index 94a65c27a2f96cf299c719d5bacff414a656b63a..4652672aba88564bc02c062587ad1f81d1aad8cf 100644 (file)
@@ -149,7 +149,7 @@ int board_init(void)
 #ifdef CONFIG_CMD_NAND
        afeb9260_nand_hw_init();
 #endif
-       at91_spi0_hw_init((1 << 0) || (1 << 1));
+       at91_spi0_hw_init((1 << 0) | (1 << 1));
 #ifdef CONFIG_MACB
        afeb9260_macb_hw_init();
 #endif
index c10ad7253465938c2f3822f2a2f54c90c44cdf3e..ed4736027cc3f21a2a7c809b4c07c26628e228d6 100644 (file)
@@ -160,7 +160,7 @@ int board_init(void)
        at91sam9260ek_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91_spi0_hw_init((1 << 0) || (1 << 1));
+       at91_spi0_hw_init((1 << 0) | (1 << 1));
 #endif
 #ifdef CONFIG_MACB
        at91sam9260ek_macb_hw_init();