aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 08:48:48 -0400
committerMark Brown <broonie@linaro.org>2013-09-01 08:48:48 -0400
commitdb04e17055c2d912a847f02a10deee1d82f96300 (patch)
tree532d5ad54f9bef73689dd481445b377f6a7f6735 /include/linux/spi
parent788a73967658ff9ccbca6fffd51c213702bfc01d (diff)
parent56ede94a000bb9635b326db38baf66da6dfc174e (diff)
Merge remote-tracking branch 'spi/topic/checks' into spi-next
Diffstat (limited to 'include/linux/spi')
-rw-r--r--include/linux/spi/spi.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index c920c2f4dad5..47854f3813d8 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -233,6 +233,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
233 * suported. If set, the SPI core will reject any transfer with an 233 * suported. If set, the SPI core will reject any transfer with an
234 * unsupported bits_per_word. If not set, this value is simply ignored, 234 * unsupported bits_per_word. If not set, this value is simply ignored,
235 * and it's up to the individual driver to perform any validation. 235 * and it's up to the individual driver to perform any validation.
236 * @min_speed_hz: Lowest supported transfer speed
237 * @max_speed_hz: Highest supported transfer speed
236 * @flags: other constraints relevant to this driver 238 * @flags: other constraints relevant to this driver
237 * @bus_lock_spinlock: spinlock for SPI bus locking 239 * @bus_lock_spinlock: spinlock for SPI bus locking
238 * @bus_lock_mutex: mutex for SPI bus locking 240 * @bus_lock_mutex: mutex for SPI bus locking
@@ -312,6 +314,10 @@ struct spi_master {
312#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1)) 314#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1))
313#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1)) 315#define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))
314 316
317 /* limits on transfer speed */
318 u32 min_speed_hz;
319 u32 max_speed_hz;
320
315 /* other constraints relevant to this driver */ 321 /* other constraints relevant to this driver */
316 u16 flags; 322 u16 flags;
317#define SPI_MASTER_HALF_DUPLEX BIT(0) /* can't do full duplex */ 323#define SPI_MASTER_HALF_DUPLEX BIT(0) /* can't do full duplex */