Skip to content

Commit 5baa189

Browse files
miquelraynalbroonie
authored andcommitted
spi: amlogic-spifc-a1: 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-5-ad218dbc406f@bootlin.com Signed-off-by: Mark Brown <[email protected]>
1 parent e6204f3 commit 5baa189

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/spi/spi-amlogic-spifc-a1.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static int amlogic_spifc_a1_exec_op(struct spi_mem *mem,
259259
size_t data_size = op->data.nbytes;
260260
int ret;
261261

262-
ret = amlogic_spifc_a1_set_freq(spifc, mem->spi->max_speed_hz);
262+
ret = amlogic_spifc_a1_set_freq(spifc, op->max_freq);
263263
if (ret)
264264
return ret;
265265

@@ -320,6 +320,10 @@ static const struct spi_controller_mem_ops amlogic_spifc_a1_mem_ops = {
320320
.adjust_op_size = amlogic_spifc_a1_adjust_op_size,
321321
};
322322

323+
static const struct spi_controller_mem_caps amlogic_spifc_a1_mem_caps = {
324+
.per_op_freq = true,
325+
};
326+
323327
static int amlogic_spifc_a1_probe(struct platform_device *pdev)
324328
{
325329
struct spi_controller *ctrl;
@@ -356,6 +360,7 @@ static int amlogic_spifc_a1_probe(struct platform_device *pdev)
356360
ctrl->bits_per_word_mask = SPI_BPW_MASK(8);
357361
ctrl->auto_runtime_pm = true;
358362
ctrl->mem_ops = &amlogic_spifc_a1_mem_ops;
363+
ctrl->mem_caps = &amlogic_spifc_a1_mem_caps;
359364
ctrl->min_speed_hz = SPIFC_A1_MIN_HZ;
360365
ctrl->max_speed_hz = SPIFC_A1_MAX_HZ;
361366
ctrl->mode_bits = (SPI_RX_DUAL | SPI_TX_DUAL |

0 commit comments

Comments
 (0)