]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: mt65xx: Support per spi-mem operation frequency switches
authorMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 24 Dec 2024 17:05:55 +0000 (18:05 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 9 Jan 2025 20:16:31 +0000 (20:16 +0000)
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.

Cc: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-10-ad218dbc406f@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mt65xx.c

index 85f3bafc975dbc3fd95f77b8dcfc0ca9aac32f5d..197bf2dbe5de7e853ccddf2c90d8bff40202f025 100644 (file)
@@ -961,7 +961,7 @@ static int mtk_spi_mem_exec_op(struct spi_mem *mem,
 
        mtk_spi_reset(mdata);
        mtk_spi_hw_init(mem->spi->controller, mem->spi);
-       mtk_spi_prepare_transfer(mem->spi->controller, mem->spi->max_speed_hz);
+       mtk_spi_prepare_transfer(mem->spi->controller, op->max_freq);
 
        reg_val = readl(mdata->base + SPI_CFG3_IPM_REG);
        /* opcode byte len */
@@ -1122,6 +1122,10 @@ static const struct spi_controller_mem_ops mtk_spi_mem_ops = {
        .exec_op = mtk_spi_mem_exec_op,
 };
 
+static const struct spi_controller_mem_caps mtk_spi_mem_caps = {
+       .per_op_freq = true,
+};
+
 static int mtk_spi_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -1160,6 +1164,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
        if (mdata->dev_comp->ipm_design) {
                mdata->dev = dev;
                host->mem_ops = &mtk_spi_mem_ops;
+               host->mem_caps = &mtk_spi_mem_caps;
                init_completion(&mdata->spimem_done);
        }