From: Mark Brown <broonie@linaro.org>
Date: Tue, 20 Aug 2013 10:52:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/checks' into spi-next
X-Git-Tag: next-20130822~40^2~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53a0a6f055321025d2641be99ef9ccb9131dadfc;p=karo-tx-linux.git

Merge remote-tracking branch 'spi/topic/checks' into spi-next
---

53a0a6f055321025d2641be99ef9ccb9131dadfc
diff --cc include/linux/spi/spi.h
index c920c2f4dad5,cdf668156154..47854f3813d8
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@@ -309,9 -311,13 +311,13 @@@ struct spi_master 
  	/* bitmask of supported bits_per_word for transfers */
  	u32			bits_per_word_mask;
  #define SPI_BPW_MASK(bits) BIT((bits) - 1)
 -#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0UL : (BIT(bits) - 1))
 +#define SPI_BIT_MASK(bits) (((bits) == 32) ? ~0U : (BIT(bits) - 1))
  #define SPI_BPW_RANGE_MASK(min, max) (SPI_BIT_MASK(max) - SPI_BIT_MASK(min - 1))
  
+ 	/* limits on transfer speed */
+ 	u32			min_speed_hz;
+ 	u32			max_speed_hz;
+ 
  	/* other constraints relevant to this driver */
  	u16			flags;
  #define SPI_MASTER_HALF_DUPLEX	BIT(0)		/* can't do full duplex */