diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 07:15:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-16 07:15:20 -0800 |
| commit | e5310a1cb4f56c54488ecaf29b1abf3b790cfddc (patch) | |
| tree | 9024ca83c94993aca4940c2d32835f2d3f500f8c /drivers/spi/spi-bcm2835aux.c | |
| parent | 2a4be2c52556ded8df08904f4032aed98654a017 (diff) | |
| parent | 4dd638f8ac6b4ed020297b5d994d9346b84f2009 (diff) | |
| download | talos-op-linux-e5310a1cb4f56c54488ecaf29b1abf3b790cfddc.tar.gz talos-op-linux-e5310a1cb4f56c54488ecaf29b1abf3b790cfddc.zip | |
Merge tag 'spi-fix-v4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A small clutch of driver specific fixes.
The OMAP one is a bit worrying since it seems to be triggered by some
changes in the runtime PM core code and I suspect there's other
drivers across that are going to be using the same pattern outside of
OMAP but nothing seems to be coming up in the testing people are
doing"
* tag 'spi-fix-v4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: omap2-mcspi: Fix PM regression with deferred probe for pm_runtime_reinit
spi: bcm2835aux: fix bitmask defines
spi: atmel: fix gpio chip-select in case of non-DT platform
spi/fsl-espi: Correct the maximum transaction length
spi: imx: fix spi resource leak with dma transfer
spi: fix counting in spi-loopback-test code
Diffstat (limited to 'drivers/spi/spi-bcm2835aux.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835aux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 7de6f8472a81..ecc73c0a97cf 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -73,8 +73,8 @@ /* Bitfields in CNTL1 */ #define BCM2835_AUX_SPI_CNTL1_CSHIGH 0x00000700 -#define BCM2835_AUX_SPI_CNTL1_IDLE 0x00000080 -#define BCM2835_AUX_SPI_CNTL1_TXEMPTY 0x00000040 +#define BCM2835_AUX_SPI_CNTL1_TXEMPTY 0x00000080 +#define BCM2835_AUX_SPI_CNTL1_IDLE 0x00000040 #define BCM2835_AUX_SPI_CNTL1_MSBF_IN 0x00000002 #define BCM2835_AUX_SPI_CNTL1_KEEP_IN 0x00000001 |
