diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-04-19 23:57:04 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-04-21 22:15:13 +0200 |
| commit | 05092a4edcef975f2d6969727cf5cc120934d693 (patch) | |
| tree | 24dda3826f20525071236cfea4da659a43c179ba | |
| parent | 43111b9715e8a56d4372efc4bdc677cbf3336df6 (diff) | |
| download | backports-05092a4edcef975f2d6969727cf5cc120934d693.tar.gz | |
backports: patches: avoid struct spi_delay usage
The struct spi_transfer got a new member "struct spi_delay delay" in
upstream commit bebcfd272df6 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()"), use the older interface in
older kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | patches/0095-spi-delay/libertas.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/patches/0095-spi-delay/libertas.patch b/patches/0095-spi-delay/libertas.patch new file mode 100644 index 00000000..4a4e59a1 --- /dev/null +++ b/patches/0095-spi-delay/libertas.patch @@ -0,0 +1,17 @@ +--- a/drivers/net/wireless/marvell/libertas/if_spi.c ++++ b/drivers/net/wireless/marvell/libertas/if_spi.c +@@ -235,9 +235,14 @@ static int spu_read(struct if_spi_card * + spi_message_add_tail(&dummy_trans, &m); + } else { + /* Busy-wait while the SPU fills the FIFO */ ++#if LINUX_VERSION_IS_GEQ(5,5,0) + reg_trans.delay.value = + DIV_ROUND_UP((100 + (delay * 10)), 1000); + reg_trans.delay.unit = SPI_DELAY_UNIT_USECS; ++#else ++ reg_trans.delay_usecs = ++ DIV_ROUND_UP((100 + (delay * 10)), 1000); ++#endif /* >= 5.5 */ + } + + /* read in data */ |