Skip to content

Commit eee7bc9

Browse files
miquelraynalbroonie
authored andcommitted
spi: dw: Support per spi-mem operation frequency switches
Every ->exec_op() call correctly configures the spi bus speed to the maximum allowed frequency for the memory using the constant spi default parameter. Since we can now have per-operation constraints, let's use the value that comes from the spi-mem operation structure instead. In case there is no specific limitation for this operation, the default spi device value will be given anyway. The per-operation frequency capability is thus advertised to the spi-mem core. Signed-off-by: Miquel Raynal <[email protected]> Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-7-ad218dbc406f@bootlin.com Signed-off-by: Mark Brown <[email protected]>
1 parent 06e9f5a commit eee7bc9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/spi/spi-dw-core.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ static int dw_spi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)
677677
* operation. Transmit-only mode is suitable for the rest of them.
678678
*/
679679
cfg.dfs = 8;
680-
cfg.freq = clamp(mem->spi->max_speed_hz, 0U, dws->max_mem_freq);
680+
cfg.freq = clamp(op->max_freq, 0U, dws->max_mem_freq);
681681
if (op->data.dir == SPI_MEM_DATA_IN) {
682682
cfg.tmode = DW_SPI_CTRLR0_TMOD_EPROMREAD;
683683
cfg.ndf = op->data.nbytes;
@@ -894,6 +894,10 @@ static void dw_spi_hw_init(struct device *dev, struct dw_spi *dws)
894894
dw_writel(dws, DW_SPI_CS_OVERRIDE, 0xF);
895895
}
896896

897+
static const struct spi_controller_mem_caps dw_spi_mem_caps = {
898+
.per_op_freq = true,
899+
};
900+
897901
int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
898902
{
899903
struct spi_controller *host;
@@ -941,8 +945,10 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)
941945
host->set_cs = dw_spi_set_cs;
942946
host->transfer_one = dw_spi_transfer_one;
943947
host->handle_err = dw_spi_handle_err;
944-
if (dws->mem_ops.exec_op)
948+
if (dws->mem_ops.exec_op) {
945949
host->mem_ops = &dws->mem_ops;
950+
host->mem_caps = &dw_spi_mem_caps;
951+
}
946952
host->max_speed_hz = dws->max_freq;
947953
host->flags = SPI_CONTROLLER_GPIO_SS;
948954
host->auto_runtime_pm = true;

0 commit comments

Comments
 (0)