diff options
| author | Tom Rini <trini@ti.com> | 2013-02-04 09:07:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:14:22 -0500 |
| commit | 2d795c9621de274cb0cb8cf4af5941293f89c3be (patch) | |
| tree | 726a2ee288654832876f3e81ff5f1d356e784e13 /drivers | |
| parent | 10ec0f8a74a35f4b601dd1c84931962b809919bb (diff) | |
| parent | 14d315b8b3e974a7f617a9b4454fc579161fb75b (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/systemace.c | 4 | ||||
| -rw-r--r-- | drivers/spi/xilinx_spi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/xilinx_spi.h | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c index 80076b46560..bf29cbbb7a8 100644 --- a/drivers/block/systemace.c +++ b/drivers/block/systemace.c @@ -65,8 +65,8 @@ static void ace_writew(u16 val, unsigned off) writeb(val, base + off); writeb(val >> 8, base + off + 1); #endif - } - out16(base + off, val); + } else + out16(base + off, val); } static u16 ace_readw(unsigned off) diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 52a4134f18b..db01cc25f71 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -99,6 +99,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, debug("%s: bus:%i cs:%i base:%p mode:%x max_hz:%d\n", __func__, bus, cs, xilspi->regs, xilspi->mode, xilspi->freq); + writel(SPISSR_RESET_VALUE, &xilspi->regs->srr); + return &xilspi->slave; } diff --git a/drivers/spi/xilinx_spi.h b/drivers/spi/xilinx_spi.h index 32610d2a121..69d0b940582 100644 --- a/drivers/spi/xilinx_spi.h +++ b/drivers/spi/xilinx_spi.h @@ -119,6 +119,9 @@ struct xilinx_spi_reg { #define SPIRFOR_OCYVAL_POS 0 #define SPIRFOR_OCYVAL_MASK (0xf << SPIRFOR_OCYVAL_POS) +/* SPI Software Reset Register (ssr) */ +#define SPISSR_RESET_VALUE 0x0a + struct xilinx_spi_slave { struct spi_slave slave; struct xilinx_spi_reg *regs; |