projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-mmc
[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 350e21aa7d65fd81d21378136b2b197a1eefc0a4..83876485fedec73fc717c343392113ae1dce171f 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"
#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);
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);
@@
-44,7
+46,7
@@
struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
void spi_flash_free(struct spi_flash *flash)
{
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,
}
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
@@
-53,11
+55,17
@@
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
{
struct spi_slave *slave;
struct udevice *bus;
{
struct spi_slave *slave;
struct udevice *bus;
- char
name[30],
*str;
+ char *str;
int ret;
int ret;
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
+ str = "spi_flash";
+#else
+ char name[30];
+
snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
str = strdup(name);
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)
ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
"spi_flash_std", str, &bus, &slave);
if (ret)
@@
-67,13
+75,29
@@
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
return 0;
}
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",
}
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),
};
.per_device_auto_alloc_size = sizeof(struct spi_flash),
};