summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbin Tonnerre <albin.tonnerre@free-electrons.com>2009-09-01 11:26:20 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-09-01 22:10:10 +0200
commit50b5fff55827946c86a60db8b21a9358be720666 (patch)
tree3378bbc8e32d9c6f5d3a6568465a0a21c2d5171a
parentf3d4f8870e69e0fd177397778d97d0751bbd020a (diff)
downloadu-boot-imx-50b5fff55827946c86a60db8b21a9358be720666.zip
u-boot-imx-50b5fff55827946c86a60db8b21a9358be720666.tar.gz
u-boot-imx-50b5fff55827946c86a60db8b21a9358be720666.tar.bz2
at91sam9260/afeb9260: Fix SPI initialization
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>
-rw-r--r--board/afeb9260/afeb9260.c2
-rw-r--r--board/atmel/at91sam9260ek/at91sam9260ek.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c
index 94a65c2..4652672 100644
--- a/board/afeb9260/afeb9260.c
+++ b/board/afeb9260/afeb9260.c
@@ -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
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index c10ad72..ed47360 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -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();