| Message ID | 1455041435-8015-2-git-send-email-stephanolbrich@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fe0e2304f560f81c1673711ac3f9a8c7c3cbb8be |
| Headers | show |
Hi Stephan, Am 09.02.2016 um 19:10 schrieb stephanolbrich@gmx.de: > From: Stephan Olbrich <stephanolbrich@gmx.de> > > The bitmasks for txempty and idle interrupts were interchanged. > > Signed-off-by: Stephan Olbrich <stephanolbrich@gmx.de> > --- > drivers/spi/spi-bcm2835aux.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c > index 7de6f84..ecc73c0 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 according to a comment in this file these values are from brcm_usrlib/dag/vmcsx/vcinclude/bcm2708_chip/aux_io.h. So you want to say that at least these 2 are wrong and you took the values from BCM2835-ARM-Peripherals.pdf [1]? I think it's worth to mention it. Regards [1] - https://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Peripherals.pdf > +#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 > -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
stephanolbrich@gmx.de writes: > From: Stephan Olbrich <stephanolbrich@gmx.de> > > The bitmasks for txempty and idle interrupts were interchanged. > > Signed-off-by: Stephan Olbrich <stephanolbrich@gmx.de> > --- > drivers/spi/spi-bcm2835aux.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c > index 7de6f84..ecc73c0 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 Confirmed by looking at the hardware. Reviewed-by: Eric Anholt <eric@anholt.net>
Hi Stefan Am Tuesday 09 February 2016, 20:54:03 schrieb Stefan Wahren: > Hi Stephan, > > Am 09.02.2016 um 19:10 schrieb stephanolbrich@gmx.de: > > From: Stephan Olbrich <stephanolbrich@gmx.de> > > > > The bitmasks for txempty and idle interrupts were interchanged. > > > > Signed-off-by: Stephan Olbrich <stephanolbrich@gmx.de> > > --- > > > > drivers/spi/spi-bcm2835aux.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c > > index 7de6f84..ecc73c0 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 > > according to a comment in this file these values are from > brcm_usrlib/dag/vmcsx/vcinclude/bcm2708_chip/aux_io.h. > > So you want to say that at least these 2 are wrong and you took the > values from BCM2835-ARM-Peripherals.pdf [1]? > > I think it's worth to mention it. Actually I stumbled across this while writing the second patch in this series and the wrong interrupt got disabled but BCM2835-ARM-Peripherals.pdf did confirm my findings. As Mark has already applied this patch I can't add any comment to it anymore, right? > [1] - > https://www.raspberrypi.org/wp-content/uploads/2012/02/BCM2835-ARM-Periphera > ls.pdf > > +#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 > > _______________________________________________ > linux-rpi-kernel mailing list > linux-rpi-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 7de6f84..ecc73c0 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