aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Fischer <moritz.fischer@ettus.com>2016-04-19 09:15:50 -0700
committerMoritz Fischer <moritz.fischer@ettus.com>2016-04-19 09:26:00 -0700
commit31d5c223ed6e0ca5569042fa1dfbcd0f18194d86 (patch)
treee9344b70351500938748e0c4caaa670fdb97e1f5
parent8bf5023ef9f1621ff5f5bfa5399bc00167c3c973 (diff)
downloaduhd-31d5c223ed6e0ca5569042fa1dfbcd0f18194d86.tar.gz
uhd-31d5c223ed6e0ca5569042fa1dfbcd0f18194d86.tar.bz2
uhd-31d5c223ed6e0ca5569042fa1dfbcd0f18194d86.zip
e3xx: spi: Fix issue introduced in 1b149f56
Kernels (3.15+) introduce the possibility to do DUAL and QUAD spi operations via spidev. Prior to this commit nothing was setting the {tx,rx}_nbits members of the struct spi_ioc_transfer. from include/uapi/linux/spi/spidev.h struct spi_ioc_transfer { __u64 tx_buf; __u64 rx_buf; __u32 len; __u32 speed_hz; __u16 delay_usecs; __u8 bits_per_word; __u8 cs_change; __u8 tx_nbits; __u8 rx_nbits; __u16 pad; }; This turns into an issue on more recent kernels, where it turns all transactions into QUAD transactions, while the controller actually doesn't support that mode of operation. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
-rw-r--r--host/lib/usrp/e300/e300_spi.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_spi.cpp b/host/lib/usrp/e300/e300_spi.cpp
index 2722d7f53..74d348555 100644
--- a/host/lib/usrp/e300/e300_spi.cpp
+++ b/host/lib/usrp/e300/e300_spi.cpp
@@ -93,6 +93,8 @@ public:
tr.rx_buf = (unsigned long) &rx[0];
tr.len = num_bits >> 3;
tr.bits_per_word = _bits;
+ tr.tx_nbits = 1;
+ tr.rx_nbits = 1;
tr.speed_hz = _speed;
tr.delay_usecs = _delay;