sf: Drop spl_flash_get_sw_write_prot

[oweals/u-boot.git] / drivers / mtd / spi / sf-uclass.c

diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 376d815026897c00763a04ea44afb7d4e0613368..9ce2ecb99ac2679347499c15aca27b11170304ee 100644 (file)
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -1,16 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
+#include <log.h>
+#include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>
 #include <dm/device-internal.h>
 #include "sf_internal.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
+int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len, void *buf)
+{
+       return log_ret(sf_get_ops(dev)->read(dev, offset, len, buf));
+}
+
+int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len,
+                      const void *buf)
+{
+       return log_ret(sf_get_ops(dev)->write(dev, offset, len, buf));
+}
+
+int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len)
+{
+       return log_ret(sf_get_ops(dev)->erase(dev, offset, len));
+}
+
 /*
  * TODO(sjg@chromium.org): This is an old-style function. We should remove
  * it when all SPI flash drivers use dm
@@ -23,12 +42,12 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
        if (spi_flash_probe_bus_cs(bus, cs, max_hz, spi_mode, &dev))
                return NULL;
 
-       return dev->uclass_priv;
+       return dev_get_uclass_priv(dev);
 }
 
 void spi_flash_free(struct spi_flash *flash)
 {
-       spi_flash_remove(flash->spi->dev);
+       device_remove(flash->spi->dev, DM_REMOVE_NORMAL);
 }
 
 int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
@@ -37,11 +56,17 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
 {
        struct spi_slave *slave;
        struct udevice *bus;
-       char name[20], *str;
+       char *str;
        int ret;
 
-       snprintf(name, sizeof(name), "%d:%d", busnum, cs);
+#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(USE_TINY_PRINTF)
+       str = "spi_flash";
+#else
+       char name[30];
+
+       snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
        str = strdup(name);
+#endif
        ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
                                  "spi_flash_std", str, &bus, &slave);
        if (ret)
@@ -51,13 +76,29 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
        return 0;
 }
 
-int spi_flash_remove(struct udevice *dev)
+static int spi_flash_post_bind(struct udevice *dev)
 {
-       return device_remove(dev);
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
+       struct dm_spi_flash_ops *ops = sf_get_ops(dev);
+       static int reloc_done;
+
+       if (!reloc_done) {
+               if (ops->read)
+                       ops->read += gd->reloc_off;
+               if (ops->write)
+                       ops->write += gd->reloc_off;
+               if (ops->erase)
+                       ops->erase += gd->reloc_off;
+
+               reloc_done++;
+       }
+#endif
+       return 0;
 }
 
 UCLASS_DRIVER(spi_flash) = {
        .id             = UCLASS_SPI_FLASH,
        .name           = "spi_flash",
+       .post_bind      = spi_flash_post_bind,
        .per_device_auto_alloc_size = sizeof(struct spi_flash),
 };