From: Alexander Dahl <ada@thorsis.com>
To: linux-spi@vger.kernel.org
Cc: "Tudor Ambarus" <tudor.ambarus@linaro.org>,
"Varshini Rajendran" <varshini.rajendran@microchip.com>,
"Bence Csókás" <csokas.bence@prolan.hu>,
"Mark Brown" <broonie@kernel.org>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
linux-arm-kernel@lists.infradead.org (moderated
list:ARM/Microchip (AT91) SoC support),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH] spi: atmel-quadspi: Update to current device naming terminology
Date: Thu, 9 Jan 2025 10:48:43 +0100 [thread overview]
Message-ID: <20250109094843.36014-1-ada@thorsis.com> (raw)
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.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
drivers/spi/atmel-quadspi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 890def915286..f5ca7e34e058 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -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);
}
--
2.39.5
next reply other threads:[~2025-01-09 9:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 9:48 Alexander Dahl [this message]
2025-01-09 13:40 ` [PATCH] spi: atmel-quadspi: Update to current device naming terminology Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250109094843.36014-1-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=claudiu.beznea@tuxon.dev \
--cc=csokas.bence@prolan.hu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=tudor.ambarus@linaro.org \
--cc=varshini.rajendran@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox