Merge branch 'master' of /home/wd/git/u-boot/master/

[oweals/u-boot.git] / board / amcc / taihu / taihu.c

diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c
index ea83671988a3efd8250a9979015cb8be2810133e..eedde597b81cc1e7024b7f67314a7d39afa0ce66 100644 (file)
--- a/board/amcc/taihu/taihu.c
+++ b/board/amcc/taihu/taihu.c
@@ -162,7 +162,7 @@ void spi_sda(int bit)
 
 unsigned char spi_read(void)
 {
-       return (unsigned char)gpio_read_out_bit(SPI_DIN_GPIO15);
+       return (unsigned char)gpio_read_in_bit(SPI_DIN_GPIO15);
 }
 
 void taihu_spi_chipsel(int cs)