| Message ID | 20230703094518.53755-3-mmkurbanov@sberdevices.ru |
|---|---|
| State | Superseded |
| Headers | show |
| Series | spi: amlogic-spifc-a1: fixes and improvements for amlogic-spifc-a1 | expand |
Mon, Jul 03, 2023 at 12:45:18PM +0300, Martin Kurbanov kirjoitti: > This patch sets the clock rate (spi_transfer->max_speed_hz) from the > amlogic_spifc_a1_exec_op(). ... > +static int amlogic_spifc_a1_set_freq(struct amlogic_spifc_a1 *spifc, u32 freq) > +{ > + int ret; > + > + if (freq == spifc->curr_speed_hz) > + return 0; > + > + ret = clk_set_rate(spifc->clk, freq); > + if (!ret) > + spifc->curr_speed_hz = freq; > + > + return ret; The form ret = clk_set_rate(spifc->clk, freq); if (ret) return ret; spifc->curr_speed_hz = freq; return 0; less error prone in case some code is squeezed in between. > +}
diff --git a/drivers/spi/spi-amlogic-spifc-a1.c b/drivers/spi/spi-amlogic-spifc-a1.c index 0c21917e4caf..7ef2a0448990 100644 --- a/drivers/spi/spi-amlogic-spifc-a1.c +++ b/drivers/spi/spi-amlogic-spifc-a1.c @@ -107,6 +107,7 @@ struct amlogic_spifc_a1 { struct clk *clk; struct device *dev; void __iomem *base; + u32 curr_speed_hz; }; static int amlogic_spifc_a1_request(struct amlogic_spifc_a1 *spifc, bool read) @@ -235,6 +236,20 @@ static int amlogic_spifc_a1_write(struct amlogic_spifc_a1 *spifc, return amlogic_spifc_a1_request(spifc, false); } +static int amlogic_spifc_a1_set_freq(struct amlogic_spifc_a1 *spifc, u32 freq) +{ + int ret; + + if (freq == spifc->curr_speed_hz) + return 0; + + ret = clk_set_rate(spifc->clk, freq); + if (!ret) + spifc->curr_speed_hz = freq; + + return ret; +} + static int amlogic_spifc_a1_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) { @@ -243,6 +258,10 @@ static int amlogic_spifc_a1_exec_op(struct spi_mem *mem, size_t data_size = op->data.nbytes; int ret; + ret = amlogic_spifc_a1_set_freq(spifc, mem->spi->max_speed_hz); + if (ret) + return ret; + amlogic_spifc_a1_user_init(spifc); amlogic_spifc_a1_set_cmd(spifc, SPIFC_A1_USER_CMD(op));
This patch sets the clock rate (spi_transfer->max_speed_hz) from the amlogic_spifc_a1_exec_op(). Signed-off-by: Martin Kurbanov <mmkurbanov@sberdevices.ru> --- drivers/spi/spi-amlogic-spifc-a1.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)