Merge branch 'master' of git://git.denx.de/u-boot-sunxi

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

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 20aa99a451dc7cab03e33625d8da6e291e3f8bf8..a822858323610864b4d4ee92cc6b0603b6b4d3ba 100644 (file)
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
  *
@@ -5,8 +6,6 @@
  * by Atmel Corporation
  *
  * Copyright (C) 2007 Atmel Corporation
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -540,9 +539,9 @@ static int davinci_ofdata_to_platadata(struct udevice *bus)
 {
        struct davinci_spi_slave *ds = dev_get_priv(bus);
        const void *blob = gd->fdt_blob;
-       int node = bus->of_offset;
+       int node = dev_of_offset(bus);
 
-       ds->regs = dev_map_physmem(bus, sizeof(struct davinci_spi_regs));
+       ds->regs = devfdt_map_physmem(bus, sizeof(struct davinci_spi_regs));
        if (!ds->regs) {
                printf("%s: could not map device address\n", __func__);
                return -EINVAL;
@@ -563,6 +562,7 @@ static const struct dm_spi_ops davinci_spi_ops = {
 static const struct udevice_id davinci_spi_ids[] = {
        { .compatible = "ti,keystone-spi" },
        { .compatible = "ti,dm6441-spi" },
+       { .compatible = "ti,da830-spi" },
        { }
 };