diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-04 14:22:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-04 14:22:04 +0200 |
| commit | c0bc2de2a5416da11ffadb0d10da975d1bdb1ada (patch) | |
| tree | 4567d804ffb3ac203bf0c8fe35e74729cfc153e7 /queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch | |
| parent | e17bd13154f55c2d0fb3f0c36ba13acabe8750ba (diff) | |
| download | stable-queue-master.tar.gz | |
Diffstat (limited to 'queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch')
| -rw-r--r-- | queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch b/queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch deleted file mode 100644 index 5bc46487b36..00000000000 --- a/queue-6.12/spi-fsl-qspi-support-per-spi-mem-operation-frequency.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0eb0997cc79b65fff30e73b5572d5633cf7752f4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin <sashal@kernel.org> -Date: Tue, 24 Dec 2024 18:05:53 +0100 -Subject: spi: fsl-qspi: Support per spi-mem operation frequency switches - -From: Miquel Raynal <miquel.raynal@bootlin.com> - -[ Upstream commit 2438db5253eb17a7c0ccb15aea4252a150dda057 ] - -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: Han Xu <han.xu@nxp.com> -Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> -Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-8-ad218dbc406f@bootlin.com -Signed-off-by: Mark Brown <broonie@kernel.org> -Signed-off-by: Sasha Levin <sashal@kernel.org> ---- - drivers/spi/spi-fsl-qspi.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c -index 79bac30e79af6..ce86f44b0e93f 100644 ---- a/drivers/spi/spi-fsl-qspi.c -+++ b/drivers/spi/spi-fsl-qspi.c -@@ -522,9 +522,10 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q) - qspi_writel(q, reg, q->iobase + QUADSPI_MCR); - } - --static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi) -+static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi, -+ const struct spi_mem_op *op) - { -- unsigned long rate = spi->max_speed_hz; -+ unsigned long rate = op->max_freq; - int ret; - - if (q->selected == spi_get_chipselect(spi, 0)) -@@ -652,7 +653,7 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) - fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK | - QUADSPI_SR_AHB_ACC_MASK), 10, 1000); - -- fsl_qspi_select_mem(q, mem->spi); -+ fsl_qspi_select_mem(q, mem->spi, op); - - if (needs_amba_base_offset(q)) - addr_offset = q->memmap_phy; -@@ -839,6 +840,10 @@ static const struct spi_controller_mem_ops fsl_qspi_mem_ops = { - .get_name = fsl_qspi_get_name, - }; - -+static const struct spi_controller_mem_caps fsl_qspi_mem_caps = { -+ .per_op_freq = true, -+}; -+ - static int fsl_qspi_probe(struct platform_device *pdev) - { - struct spi_controller *ctlr; -@@ -923,6 +928,7 @@ static int fsl_qspi_probe(struct platform_device *pdev) - ctlr->bus_num = -1; - ctlr->num_chipselect = 4; - ctlr->mem_ops = &fsl_qspi_mem_ops; -+ ctlr->mem_caps = &fsl_qspi_mem_caps; - - fsl_qspi_default_setup(q); - --- -2.39.5 - |