Skip to content

Commit 5e56618

Browse files
LeSpockybroonie
authored andcommitted
spi: atmel-quadspi: Update to current device naming terminology
For v6.9 the spi subsystem changed the terminology to host and target devices, see commit 99769a5 ("spi: Update the "master/slave" terminology in documentation") for reference. Support for SAMA7G5 was forward ported recently from an old vendor branch before that terminology change, so naming for the new struct member is adapted to follow the current scheme. Signed-off-by: Alexander Dahl <ada@thorsis.com> Link: https://patch.msgid.link/20250109094843.36014-1-ada@thorsis.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 636ee57 commit 5e56618

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/spi/atmel-quadspi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ struct atmel_qspi {
280280
u32 irq_mask;
281281
u32 mr;
282282
u32 scr;
283-
u32 slave_max_speed_hz;
283+
u32 target_max_speed_hz;
284284
struct completion cmd_completion;
285285
struct completion dma_completion;
286286
dma_addr_t mmap_phys_base;
@@ -1041,7 +1041,7 @@ static int atmel_qspi_set_pad_calibration(struct atmel_qspi *aq)
10411041

10421042
/* Refresh analogic blocks every 1 ms.*/
10431043
atmel_qspi_write(FIELD_PREP(QSPI_REFRESH_DELAY_COUNTER,
1044-
aq->slave_max_speed_hz / 1000),
1044+
aq->target_max_speed_hz / 1000),
10451045
aq, QSPI_REFRESH);
10461046

10471047
return ret;
@@ -1064,12 +1064,12 @@ static int atmel_qspi_set_gclk(struct atmel_qspi *aq)
10641064
return ret;
10651065
}
10661066

1067-
if (aq->slave_max_speed_hz > QSPI_DLLCFG_THRESHOLD_FREQ)
1067+
if (aq->target_max_speed_hz > QSPI_DLLCFG_THRESHOLD_FREQ)
10681068
atmel_qspi_write(QSPI_DLLCFG_RANGE, aq, QSPI_DLLCFG);
10691069
else
10701070
atmel_qspi_write(0, aq, QSPI_DLLCFG);
10711071

1072-
ret = clk_set_rate(aq->gclk, aq->slave_max_speed_hz);
1072+
ret = clk_set_rate(aq->gclk, aq->target_max_speed_hz);
10731073
if (ret) {
10741074
dev_err(&aq->pdev->dev, "Failed to set generic clock rate.\n");
10751075
return ret;
@@ -1131,8 +1131,8 @@ static int atmel_qspi_sama7g5_setup(struct spi_device *spi)
11311131
{
11321132
struct atmel_qspi *aq = spi_controller_get_devdata(spi->controller);
11331133

1134-
/* The controller can communicate with a single slave. */
1135-
aq->slave_max_speed_hz = spi->max_speed_hz;
1134+
/* The controller can communicate with a single peripheral device (target). */
1135+
aq->target_max_speed_hz = spi->max_speed_hz;
11361136

11371137
return atmel_qspi_sama7g5_init(aq);
11381138
}

0 commit comments

Comments
 (0)