diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
| commit | 612404c28a64a6df300642a1550a65dcc8e01f82 (patch) | |
| tree | 5be664967ba39c93dc27da5cc547d350e7c0fc17 /drivers/spi | |
| parent | ea33fb1a32e8e3f408b311823cabbb7453148f80 (diff) | |
| parent | ac81e1ccf7135d8004763bbf9bef1d95a03fbe92 (diff) | |
| download | u-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.zip u-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.tar.gz u-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.tar.bz2 | |
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/atmel_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index c7a51f7..ce7d460 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -92,7 +92,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, as->slave.cs = cs; as->regs = regs; as->mr = ATMEL_SPI_MR_MSTR | ATMEL_SPI_MR_MODFDIS -#if defined(CONFIG_AT91SAM9X5) +#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9M10G45) | ATMEL_SPI_MR_WDRBT #endif | ATMEL_SPI_MR_PCS(~(1 << cs) & 0xf); |