mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
spi: nxp-fspi: Support per spi-mem operation frequency switches
[ Upstream commit 26851cf65ffca2d3a8d529a125e54cf0084d69e7 ] 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: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-12-ad218dbc406f@bootlin.com Signed-off-by: Mark Brown <broonie@kernel.org> Stable-dep-of: 40ad64ac25bb ("spi: nxp-fspi: Propagate fwnode in ACPI case as well") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
a25cc746f7
commit
5fc6f8175b
@@ -711,9 +711,10 @@ static void nxp_fspi_dll_calibration(struct nxp_fspi *f)
|
||||
* Value for rest of the CS FLSHxxCR0 register would be zero.
|
||||
*
|
||||
*/
|
||||
static void nxp_fspi_select_mem(struct nxp_fspi *f, struct spi_device *spi)
|
||||
static void nxp_fspi_select_mem(struct nxp_fspi *f, 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;
|
||||
uint64_t size_kb;
|
||||
|
||||
@@ -938,7 +939,7 @@ static int nxp_fspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
|
||||
FSPI_STS0_ARB_IDLE, 1, POLL_TOUT, true);
|
||||
WARN_ON(err);
|
||||
|
||||
nxp_fspi_select_mem(f, mem->spi);
|
||||
nxp_fspi_select_mem(f, mem->spi, op);
|
||||
|
||||
nxp_fspi_prepare_lut(f, op);
|
||||
/*
|
||||
@@ -1156,6 +1157,10 @@ static const struct spi_controller_mem_ops nxp_fspi_mem_ops = {
|
||||
.get_name = nxp_fspi_get_name,
|
||||
};
|
||||
|
||||
static const struct spi_controller_mem_caps nxp_fspi_mem_caps = {
|
||||
.per_op_freq = true,
|
||||
};
|
||||
|
||||
static int nxp_fspi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr;
|
||||
@@ -1253,6 +1258,7 @@ static int nxp_fspi_probe(struct platform_device *pdev)
|
||||
ctlr->bus_num = -1;
|
||||
ctlr->num_chipselect = NXP_FSPI_MAX_CHIPSELECT;
|
||||
ctlr->mem_ops = &nxp_fspi_mem_ops;
|
||||
ctlr->mem_caps = &nxp_fspi_mem_caps;
|
||||
|
||||
nxp_fspi_default_setup(f);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user