spi: atmel-quadspi: Update to current device naming terminology
Subsystems (2)
PATCH 1/1 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 99769a52464d ("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.
--- drivers/spi/atmel-quadspi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/spi/atmel-quadspi.c +6 -6
@@ -280,7 +280,7 @@ struct atmel_qspi {u32 irq_mask;u32 mr;u32 scr; -u32 slave_max_speed_hz; +u32 target_max_speed_hz;struct completion cmd_completion;struct completion dma_completion;dma_addr_t mmap_phys_base;
@@ -1057,7 +1057,7 @@ static int atmel_qspi_set_pad_calibration(struct atmel_qspi *aq)/* Refresh analogic blocks every 1 ms.*/ atmel_qspi_write (FIELD_PREP (QSPI_REFRESH_DELAY_COUNTER , - aq->slave_max_speed_hz /1000 ), + aq->target_max_speed_hz /1000 ), aq,QSPI_REFRESH );return ret;
@@ -1080,12 +1080,12 @@ static int atmel_qspi_set_gclk(struct atmel_qspi *aq)return ret; } -if (aq->slave_max_speed_hz >QSPI_DLLCFG_THRESHOLD_FREQ ) +if (aq->target_max_speed_hz >QSPI_DLLCFG_THRESHOLD_FREQ )atmel_qspi_write (QSPI_DLLCFG_RANGE , aq,QSPI_DLLCFG );else atmel_qspi_write (0 , aq,QSPI_DLLCFG ); - ret =clk_set_rate (aq->gclk, aq->slave_max_speed_hz); + ret =clk_set_rate (aq->gclk, aq->target_max_speed_hz);if (ret) {dev_err (&aq->pdev->dev,"Failed to set generic clock rate.\n" );return ret;
@@ -1149,8 +1149,8 @@ static int atmel_qspi_sama7g5_setup(struct spi_device *spi) {struct atmel_qspi *aq =spi_controller_get_devdata (spi->controller); -/* The controller can communicate with a single slave. */ - aq->slave_max_speed_hz = spi->max_speed_hz; +/* The controller can communicate with a single peripheral device (target). */ + aq->target_max_speed_hz = spi->max_speed_hz;return atmel_qspi_sama7g5_init (aq); }
Signature · 1 line
2.39.5
Mark Brown
maintainerQuoted 8 lines · Alexander Dahl
For v6.9 the spi subsystem changed the terminology to host and target devices, see commit
99769a52464d("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.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: atmel-quadspi: Update to current device naming terminology
commit: 5e56618e1593a9eb9d72dc9433ac7a02a6c48c8f
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark