dm: serial: Don't support CONFIG_CONS_INDEX with device tree

[karo-tx-uboot.git] / drivers / spi / davinci_spi.c

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 28fb3a2e9f8f0e0c01214cc669a5383e96688470..bf18362baaf81cdb9e37fdc71139f18712d07f33 100644 (file)
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -32,16 +32,13 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
        if (!ds)
                return NULL;
 
-       ds->slave.bus = bus;
-       ds->slave.cs = cs;
-
        switch (bus) {
        case SPI0_BUS:
                ds->regs = (struct davinci_spi_regs *)SPI0_BASE;
                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