spl: mmc: Unify non/driver model spl_mmc_find_device()

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

diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 4b25902b8dcd42d579a7925a9ec26347e90bdfc4..72e0f6b3fb1e591124ae2bfc879ac3685d6405b5 100644 (file)
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -11,6 +11,8 @@
 #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 sf_get_ops(dev)->read(dev, offset, len, buf);
@@ -53,10 +55,10 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
 {
        struct spi_slave *slave;
        struct udevice *bus;
-       char name[20], *str;
+       char name[30], *str;
        int ret;
 
-       snprintf(name, sizeof(name), "%d:%d", busnum, cs);
+       snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
        str = strdup(name);
        ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
                                  "spi_flash_std", str, &bus, &slave);
@@ -72,8 +74,29 @@ int spi_flash_remove(struct udevice *dev)
        return device_remove(dev);
 }
 
+static int spi_flash_post_bind(struct udevice *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),
 };