diff options
| author | Tom Rini <trini@ti.com> | 2015-08-17 13:29:54 +0530 |
|---|---|---|
| committer | Jagan Teki <jteki@openedev.com> | 2015-08-17 23:29:14 +0530 |
| commit | 146bad96191753f1918bfa4dca75d20e03fc63b2 (patch) | |
| tree | 88aa8eca08516457d4c4b4e3b694f74e640c28a4 | |
| parent | 5b3b0d687ef927fff56d6c2af1f2a1134e6ee31c (diff) | |
| download | u-boot-imx-146bad96191753f1918bfa4dca75d20e03fc63b2.zip u-boot-imx-146bad96191753f1918bfa4dca75d20e03fc63b2.tar.gz u-boot-imx-146bad96191753f1918bfa4dca75d20e03fc63b2.tar.bz2 | |
sf: ops: Add spi_flash_copy_mmap function
When doing a memory mapped copy we may have DMA available and thus need
to have this copy abstracted so that the driver can do it, rather than a
simple memcpy.
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
| -rw-r--r-- | drivers/mtd/spi/sf_ops.c | 8 | ||||
| -rw-r--r-- | include/spi.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 38592f5..900ec1f 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -14,6 +14,7 @@ #include <spi.h> #include <spi_flash.h> #include <watchdog.h> +#include <linux/compiler.h> #include "sf_internal.h" @@ -378,6 +379,11 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, return ret; } +void __weak spi_flash_copy_mmap(void *data, void *offset, size_t len) +{ + memcpy(data, offset, len); +} + int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, size_t len, void *data) { @@ -394,7 +400,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, return ret; } spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP); - memcpy(data, flash->memory_map + offset, len); + spi_flash_copy_mmap(data, flash->memory_map + offset, len); spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP_END); spi_release_bus(flash->spi); return 0; diff --git a/include/spi.h b/include/spi.h index 1836236..51fdfd6 100644 --- a/include/spi.h +++ b/include/spi.h @@ -272,6 +272,9 @@ int spi_set_wordlen(struct spi_slave *slave, unsigned int wordlen); int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags); +/* Copy memory mapped data */ +void spi_flash_copy_mmap(void *data, void *offset, size_t len); + /** * Determine if a SPI chipselect is valid. * This function is provided by the board if the low-level SPI driver |