Merge tag 'u-boot-amlogic-20181207' of git://git.denx.de/u-boot-amlogic

[platform/kernel/u-boot.git] / drivers / spi / davinci_spi.c

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 291ef95..4d2c106 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>
@@ -15,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <dm.h>
+#include <dm/platform_data/spi_davinci.h>
 
 /* SPIGCR0 */
 #define SPIGCR0_SPIENA_MASK    0x1
@@ -388,11 +388,6 @@ void spi_cs_deactivate(struct spi_slave *slave)
        /* do nothing */
 }
 
-void spi_init(void)
-{
-       /* do nothing */
-}
-
 struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
                        unsigned int max_hz, unsigned int mode)
 {
@@ -530,49 +525,58 @@ static int davinci_spi_xfer(struct udevice *dev, unsigned int bitlen,
        return __davinci_spi_xfer(ds, bitlen, dout, din, flags);
 }
 
+static const struct dm_spi_ops davinci_spi_ops = {
+       .claim_bus      = davinci_spi_claim_bus,
+       .release_bus    = davinci_spi_release_bus,
+       .xfer           = davinci_spi_xfer,
+       .set_speed      = davinci_spi_set_speed,
+       .set_mode       = davinci_spi_set_mode,
+};
+
 static int davinci_spi_probe(struct udevice *bus)
 {
-       /* Nothing to do */
+       struct davinci_spi_slave *ds = dev_get_priv(bus);
+       struct davinci_spi_platdata *plat = bus->platdata;
+       ds->regs = plat->regs;
+       ds->num_cs = plat->num_cs;
+
        return 0;
 }
 
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 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 = dev_of_offset(bus);
+       struct davinci_spi_platdata *plat = bus->platdata;
+       fdt_addr_t addr;
 
-       ds->regs = devfdt_map_physmem(bus, sizeof(struct davinci_spi_regs));
-       if (!ds->regs) {
-               printf("%s: could not map device address\n", __func__);
+       addr = devfdt_get_addr(bus);
+       if (addr == FDT_ADDR_T_NONE)
                return -EINVAL;
-       }
-       ds->num_cs = fdtdec_get_int(blob, node, "num-cs", 4);
+
+       plat->regs = (struct davinci_spi_regs *)addr;
+       plat->num_cs = fdtdec_get_int(gd->fdt_blob, dev_of_offset(bus), "num-cs", 4);
 
        return 0;
 }
 
-static const struct dm_spi_ops davinci_spi_ops = {
-       .claim_bus      = davinci_spi_claim_bus,
-       .release_bus    = davinci_spi_release_bus,
-       .xfer           = davinci_spi_xfer,
-       .set_speed      = davinci_spi_set_speed,
-       .set_mode       = davinci_spi_set_mode,
-};
-
 static const struct udevice_id davinci_spi_ids[] = {
        { .compatible = "ti,keystone-spi" },
        { .compatible = "ti,dm6441-spi" },
+       { .compatible = "ti,da830-spi" },
        { }
 };
+#endif
 
 U_BOOT_DRIVER(davinci_spi) = {
        .name = "davinci_spi",
        .id = UCLASS_SPI,
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
        .of_match = davinci_spi_ids,
-       .ops = &davinci_spi_ops,
        .ofdata_to_platdata = davinci_ofdata_to_platadata,
-       .priv_auto_alloc_size = sizeof(struct davinci_spi_slave),
+        .platdata_auto_alloc_size = sizeof(struct davinci_spi_platdata),
+#endif
        .probe = davinci_spi_probe,
+       .ops = &davinci_spi_ops,
+       .priv_auto_alloc_size = sizeof(struct davinci_spi_slave),
 };
 #endif