Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[u-boot] / drivers / spi / davinci_spi.c

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 28fb3a2e9f8f0e0c01214cc669a5383e96688470..0ec5b9d85920d4aca224fc91925925d5ca25703a 100644 (file)
--- 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