From b57e0347d7895d10f8055785205815142e732eec Mon Sep 17 00:00:00 2001 From: Justin Clacherty Date: Fri, 26 Jan 2007 00:56:44 -0800 Subject: [PATCH] --- yaml --- r: 45822 b: refs/heads/master c: 7f6ee1adc75bf31d1b76814338f76a88e653cb60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/pxa2xx_spi.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b52bf5ddfa74..d40447ff9f48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8736b9270c2f8993ca44c30f64d4c6d25e379687 +refs/heads/master: 7f6ee1adc75bf31d1b76814338f76a88e653cb60 diff --git a/trunk/drivers/spi/pxa2xx_spi.c b/trunk/drivers/spi/pxa2xx_spi.c index 6ed3f1da9296..8b41f9cc2560 100644 --- a/trunk/drivers/spi/pxa2xx_spi.c +++ b/trunk/drivers/spi/pxa2xx_spi.c @@ -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)