Merge remote-tracking branch 'spi/topic/checks' into spi-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:48 +0000 (13:48 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:48:48 +0000 (13:48 +0100)
1  2 
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 */