Add spi-mem setup function support SPI memory operations the spi-mem setup function running after the spi-mem probe function if the spi-mem setup function implemented. Signed-off-by: Tomer Maimon <tmaimon77@xxxxxxxxx> --- drivers/spi/spi-mem.c | 27 ++++++++++++++++++++++++++- include/linux/spi/spi-mem.h | 4 ++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 9f0fa9f3116d..21fe3a75d636 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -398,6 +398,26 @@ const char *spi_mem_get_name(struct spi_mem *mem) } EXPORT_SYMBOL_GPL(spi_mem_get_name); +/** + * spi_mem_setup() - Execute spi memory setup + * @mem: the SPI memory + * + * This function allows SPI mem users to execute spi memory + * setup after the probe finished. + * + * Return: 0 in case of success, a negative error code otherwise. + */ +int spi_mem_setup(struct spi_mem *mem) +{ + struct spi_controller *ctlr = mem->spi->controller; + + if (ctlr->mem_ops && ctlr->mem_ops->setup) + return ctlr->mem_ops->setup(mem); + + return 0; +} +EXPORT_SYMBOL_GPL(spi_mem_setup); + /** * spi_mem_adjust_op_size() - Adjust the data size of a SPI mem operation to * match controller limitations @@ -723,6 +743,7 @@ static int spi_mem_probe(struct spi_device *spi) struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver); struct spi_controller *ctlr = spi->controller; struct spi_mem *mem; + int ret; mem = devm_kzalloc(&spi->dev, sizeof(*mem), GFP_KERNEL); if (!mem) @@ -740,7 +761,11 @@ static int spi_mem_probe(struct spi_device *spi) spi_set_drvdata(spi, mem); - return memdrv->probe(mem); + ret = memdrv->probe(mem); + if (ret) + return ret; + + return spi_mem_setup(mem); } static int spi_mem_remove(struct spi_device *spi) diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h index af9ff2f0f1b2..5f7d20bd2b09 100644 --- a/include/linux/spi/spi-mem.h +++ b/include/linux/spi/spi-mem.h @@ -222,6 +222,7 @@ static inline void *spi_mem_get_drvdata(struct spi_mem *mem) * Note that if the implementation of this function allocates memory * dynamically, then it should do so with devm_xxx(), as we don't * have a ->free_name() function. + * @setup: execute a SPI memory setup * @dirmap_create: create a direct mapping descriptor that can later be used to * access the memory device. This method is optional * @dirmap_destroy: destroy a memory descriptor previous created by @@ -256,6 +257,7 @@ struct spi_controller_mem_ops { int (*exec_op)(struct spi_mem *mem, const struct spi_mem_op *op); const char *(*get_name)(struct spi_mem *mem); + int (*setup)(struct spi_mem *mem); int (*dirmap_create)(struct spi_mem_dirmap_desc *desc); void (*dirmap_destroy)(struct spi_mem_dirmap_desc *desc); ssize_t (*dirmap_read)(struct spi_mem_dirmap_desc *desc, @@ -334,6 +336,8 @@ int spi_mem_exec_op(struct spi_mem *mem, const char *spi_mem_get_name(struct spi_mem *mem); +int spi_mem_setup(struct spi_mem *mem); + struct spi_mem_dirmap_desc * spi_mem_dirmap_create(struct spi_mem *mem, const struct spi_mem_dirmap_info *info); -- 2.18.0