diff options
| author | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
| commit | fe8b3212b7938861eacdefe6115810303a96f9cc (patch) | |
| tree | 281508c9caa5a969597a4dff58d3027337b8759c /drivers/spi/davinci_spi.c | |
| parent | a176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff) | |
| parent | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff) | |
| download | talos-obmc-uboot-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.gz talos-obmc-uboot-fe8b3212b7938861eacdefe6115810303a96f9cc.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/spi/davinci_spi.c')
| -rw-r--r-- | drivers/spi/davinci_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 28fb3a2e9f..0ec5b9d859 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -41,7 +41,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, break; #ifdef CONFIG_SYS_SPI1 case SPI1_BUS: - ds->regs = (struct davinci_spi_regs *)SPI0_BASE; + ds->regs = (struct davinci_spi_regs *)SPI1_BASE; break; #endif #ifdef CONFIG_SYS_SPI2 |
