| Message ID | 20200227142414.16547-1-sergiu.cuciurean@analog.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | fpga: machxo2-spi: Use new structure for SPI transfer delays | expand |
On Thu, Feb 27, 2020 at 04:24:14PM +0200, Sergiu Cuciurean wrote: > In a recent change to the SPI subsystem [1], a new `delay` struct was added > to replace the `delay_usecs`. This change replaces the current > `delay_usecs` with `delay` for this driver. > > The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure > that both `delay_usecs` & `delay` are used (in this order to preserve > backwards compatibility). > > [1] commit bebcfd272df6 ("spi: introduce `delay` field for > `spi_transfer` + spi_transfer_delay_exec()") > > Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com> > --- > drivers/fpga/machxo2-spi.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c > index 4d8a87641587..b316369156fe 100644 > --- a/drivers/fpga/machxo2-spi.c > +++ b/drivers/fpga/machxo2-spi.c > @@ -157,7 +157,8 @@ static int machxo2_cleanup(struct fpga_manager *mgr) > spi_message_init(&msg); > tx[1].tx_buf = &refresh; > tx[1].len = sizeof(refresh); > - tx[1].delay_usecs = MACHXO2_REFRESH_USEC; > + tx[1].delay.value = MACHXO2_REFRESH_USEC; > + tx[1].delay.unit = SPI_DELAY_UNIT_USECS; > spi_message_add_tail(&tx[1], &msg); > ret = spi_sync(spi, &msg); > if (ret) > @@ -208,7 +209,8 @@ static int machxo2_write_init(struct fpga_manager *mgr, > spi_message_init(&msg); > tx[0].tx_buf = &enable; > tx[0].len = sizeof(enable); > - tx[0].delay_usecs = MACHXO2_LOW_DELAY_USEC; > + tx[0].delay.value = MACHXO2_LOW_DELAY_USEC; > + tx[0].delay.unit = SPI_DELAY_UNIT_USECS; > spi_message_add_tail(&tx[0], &msg); > > tx[1].tx_buf = &erase; > @@ -269,7 +271,8 @@ static int machxo2_write(struct fpga_manager *mgr, const char *buf, > spi_message_init(&msg); > tx.tx_buf = payload; > tx.len = MACHXO2_BUF_SIZE; > - tx.delay_usecs = MACHXO2_HIGH_DELAY_USEC; > + tx.delay.value = MACHXO2_HIGH_DELAY_USEC; > + tx.delay.unit = SPI_DELAY_UNIT_USECS; > spi_message_add_tail(&tx, &msg); > ret = spi_sync(spi, &msg); > if (ret) { > @@ -317,7 +320,8 @@ static int machxo2_write_complete(struct fpga_manager *mgr, > spi_message_init(&msg); > tx[1].tx_buf = &refresh; > tx[1].len = sizeof(refresh); > - tx[1].delay_usecs = MACHXO2_REFRESH_USEC; > + tx[1].delay.value = MACHXO2_REFRESH_USEC; > + tx[1].delay.unit = SPI_DELAY_UNIT_USECS; > spi_message_add_tail(&tx[1], &msg); > ret = spi_sync(spi, &msg); > if (ret) > -- > 2.17.1 > Applied to for-next, Thanks
diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c index 4d8a87641587..b316369156fe 100644 --- a/drivers/fpga/machxo2-spi.c +++ b/drivers/fpga/machxo2-spi.c @@ -157,7 +157,8 @@ static int machxo2_cleanup(struct fpga_manager *mgr) spi_message_init(&msg); tx[1].tx_buf = &refresh; tx[1].len = sizeof(refresh); - tx[1].delay_usecs = MACHXO2_REFRESH_USEC; + tx[1].delay.value = MACHXO2_REFRESH_USEC; + tx[1].delay.unit = SPI_DELAY_UNIT_USECS; spi_message_add_tail(&tx[1], &msg); ret = spi_sync(spi, &msg); if (ret) @@ -208,7 +209,8 @@ static int machxo2_write_init(struct fpga_manager *mgr, spi_message_init(&msg); tx[0].tx_buf = &enable; tx[0].len = sizeof(enable); - tx[0].delay_usecs = MACHXO2_LOW_DELAY_USEC; + tx[0].delay.value = MACHXO2_LOW_DELAY_USEC; + tx[0].delay.unit = SPI_DELAY_UNIT_USECS; spi_message_add_tail(&tx[0], &msg); tx[1].tx_buf = &erase; @@ -269,7 +271,8 @@ static int machxo2_write(struct fpga_manager *mgr, const char *buf, spi_message_init(&msg); tx.tx_buf = payload; tx.len = MACHXO2_BUF_SIZE; - tx.delay_usecs = MACHXO2_HIGH_DELAY_USEC; + tx.delay.value = MACHXO2_HIGH_DELAY_USEC; + tx.delay.unit = SPI_DELAY_UNIT_USECS; spi_message_add_tail(&tx, &msg); ret = spi_sync(spi, &msg); if (ret) { @@ -317,7 +320,8 @@ static int machxo2_write_complete(struct fpga_manager *mgr, spi_message_init(&msg); tx[1].tx_buf = &refresh; tx[1].len = sizeof(refresh); - tx[1].delay_usecs = MACHXO2_REFRESH_USEC; + tx[1].delay.value = MACHXO2_REFRESH_USEC; + tx[1].delay.unit = SPI_DELAY_UNIT_USECS; spi_message_add_tail(&tx[1], &msg); ret = spi_sync(spi, &msg); if (ret)
In a recent change to the SPI subsystem [1], a new `delay` struct was added to replace the `delay_usecs`. This change replaces the current `delay_usecs` with `delay` for this driver. The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure that both `delay_usecs` & `delay` are used (in this order to preserve backwards compatibility). [1] commit bebcfd272df6 ("spi: introduce `delay` field for `spi_transfer` + spi_transfer_delay_exec()") Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com> --- drivers/fpga/machxo2-spi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)