projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spidernet: autoneg support for Celleb
[powerpc.git]
/
drivers
/
spi
/
pxa2xx_spi.c
diff --git
a/drivers/spi/pxa2xx_spi.c
b/drivers/spi/pxa2xx_spi.c
index
6ed3f1d
..
9f2c887
100644
(file)
--- a/
drivers/spi/pxa2xx_spi.c
+++ b/
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);
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)
/* NOTE: PXA25x_SSP _could_ use external clocking ... */
if (drv_data->ssp_type != PXA25x_SSP)
@@
-1213,9
+1214,9
@@
static int setup(struct spi_device *spi)
return 0;
}
return 0;
}
-static void cleanup(
const
struct spi_device *spi)
+static void cleanup(struct spi_device *spi)
{
{
- struct chip_data *chip = spi_get_ctldata(
(struct spi_device *)
spi);
+ struct chip_data *chip = spi_get_ctldata(spi);
kfree(chip);
}
kfree(chip);
}