diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:56:34 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:57:51 -0400 |
| commit | 72e20f5704987c27e549c85706b125fd4bac02c7 (patch) | |
| tree | c5a252708f5a4f6e04cd9390c5bd29b8bd48fda4 /cpu | |
| parent | 405bb978ee2321b6cf5381a012c812bdc7679e40 (diff) | |
| parent | 251484cfb845d5d54c652a1801270ede1521ca6d (diff) | |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
include/configs/at91sam9261ek.h
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm926ejs/at91sam926x/spi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpu/arm926ejs/at91sam926x/spi.c b/cpu/arm926ejs/at91sam926x/spi.c index bd855283b9..185874ed3d 100644 --- a/cpu/arm926ejs/at91sam926x/spi.c +++ b/cpu/arm926ejs/at91sam926x/spi.c @@ -98,7 +98,10 @@ void AT91F_SpiInit(void) { /* Reset the SPI */ AT91C_BASE_SPI0->SPI_CR = AT91C_SPI_SWRST; - +#ifdef CONFIG_AT91SAM9263EK + AT91C_BASE_SPI0->SPI_CR = AT91C_SPI_SWRST; +#endif + /* Configure SPI in Master Mode with No CS selected !!! */ AT91C_BASE_SPI0->SPI_MR = AT91C_SPI_MSTR | AT91C_SPI_MODFDIS | AT91C_SPI_PCS; |