X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fspi%2Fomap3_spi.c;h=ebbdcaf14a069035611504b2a8de377137737569;hb=a89302cc7908de36e949b02013ac05ce5ef8b354;hp=76d376ac44500eebc7b201f463ba0ee55259fb61;hpb=4f66e09bb9fbc47b73f67c3cc08ee2663e8fcdb1;p=oweals%2Fu-boot.git

diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 76d376ac44..ebbdcaf14a 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -568,7 +568,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	priv->freq = max_hz;
 	priv->mode = mode;
 	priv->wordlen = priv->slave.wordlen;
-#ifdef CONFIG_OMAP3_SPI_D0_D1_SWAPPED
+#if 0
+	/* Please migrate to DM_SPI support for this feature. */
 	priv->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
 #endif
 
@@ -632,7 +633,7 @@ static int omap3_spi_probe(struct udevice *dev)
 	struct omap2_mcspi_platform_config* data =
 		(struct omap2_mcspi_platform_config*)dev_get_driver_data(dev);
 
-	priv->regs = (struct mcspi *)(dev_get_addr(dev) + data->regs_offset);
+	priv->regs = (struct mcspi *)(devfdt_get_addr(dev) + data->regs_offset);
 	priv->pin_dir = fdtdec_get_uint(blob, node, "ti,pindir-d0-out-d1-in",
 					    MCSPI_PINDIR_D0_IN_D1_OUT);
 	priv->wordlen = SPI_DEFAULT_WORDLEN;