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 <miquel.raynal@bootlin.com>
Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-5-ad218dbc406f@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-amlogic-spifc-a1.c b/drivers/spi/spi-amlogic-spifc-a1.c
index fadf6667cd51c40a29749b378b82161a337edc62..18c9aa2cbc290d8ac179438ab42c27e1a722d422 100644 (file)
--- a/drivers/spi/spi-amlogic-spifc-a1.c
+++ b/drivers/spi/spi-amlogic-spifc-a1.c
@@ -259,7 +259,7 @@ static int amlogic_spifc_a1_exec_op(struct spi_mem *mem,
        size_t data_size = op->data.nbytes;
        int ret;
 
-       ret = amlogic_spifc_a1_set_freq(spifc, mem->spi->max_speed_hz);
+       ret = amlogic_spifc_a1_set_freq(spifc, op->max_freq);
        if (ret)
                return ret;
 
@@ -320,6 +320,10 @@ static const struct spi_controller_mem_ops amlogic_spifc_a1_mem_ops = {
        .adjust_op_size = amlogic_spifc_a1_adjust_op_size,
 };
 
+static const struct spi_controller_mem_caps amlogic_spifc_a1_mem_caps = {
+       .per_op_freq = true,
+};
+
 static int amlogic_spifc_a1_probe(struct platform_device *pdev)
 {
        struct spi_controller *ctrl;
@@ -356,6 +360,7 @@ static int amlogic_spifc_a1_probe(struct platform_device *pdev)
        ctrl->bits_per_word_mask = SPI_BPW_MASK(8);
        ctrl->auto_runtime_pm = true;
        ctrl->mem_ops = &amlogic_spifc_a1_mem_ops;
+       ctrl->mem_caps = &amlogic_spifc_a1_mem_caps;
        ctrl->min_speed_hz = SPIFC_A1_MIN_HZ;
        ctrl->max_speed_hz = SPIFC_A1_MAX_HZ;
        ctrl->mode_bits = (SPI_RX_DUAL | SPI_TX_DUAL |