Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f6ee1ad authored by Justin Clacherty's avatar Justin Clacherty Committed by Linus Torvalds
Browse files

[PATCH] spi: fix error setting the spi mode in pxa2xx_spi.c 



Currently the spi mode can be set to the wrong mode if you are switching
from any mode other than mode 0.  This is because the mode is set using a
bitwise or on uncleared bits.  The following patch clears the mode bits
before setting the new mode.  I've also modified it to use the appropriate
defines from pxa-regs.h for readability.

Signed-off-by: default avatarJustin Clacherty <justin@redfish-group.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8736b927

drivers/spi/pxa2xx_spi.c

+3 −2
Original line number Diff line number Diff line
@@ -1169,8 +1169,9 @@ static int setup(struct spi_device *spi) 
				spi->bits_per_word - 16 : spi->bits_per_word)

			| SSCR0_SSE

			| (spi->bits_per_word > 16 ? SSCR0_EDSS : 0);

	chip->cr1 |= (((spi->mode & SPI_CPHA) != 0) << 4)

			| (((spi->mode & SPI_CPOL) != 0) << 3);

	chip->cr1 &= ~(SSCR1_SPO | SSCR1_SPH);

	chip->cr1 |= (((spi->mode & SPI_CPHA) != 0) ? SSCR1_SPH : 0)

			| (((spi->mode & SPI_CPOL) != 0) ? SSCR1_SPO : 0);



	/* NOTE:  PXA25x_SSP _could_ use external clocking ... */

	if (drv_data->ssp_type != PXA25x_SSP)