aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/pxa2xx_spi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 36828358a4d8..35d4e5cdb631 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1318,14 +1318,14 @@ static int setup(struct spi_device *spi)
1318 /* NOTE: PXA25x_SSP _could_ use external clocking ... */ 1318 /* NOTE: PXA25x_SSP _could_ use external clocking ... */
1319 if (drv_data->ssp_type != PXA25x_SSP) 1319 if (drv_data->ssp_type != PXA25x_SSP)
1320 dev_dbg(&spi->dev, "%ld Hz actual, %s\n", 1320 dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
1321 clk_get_rate(ssp->clk) 1321 clk_get_rate(ssp->clk)
1322 / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)), 1322 / (1 + ((chip->cr0 & SSCR0_SCR(0xfff)) >> 8)),
1323 chip->enable_dma ? "DMA" : "PIO"); 1323 chip->enable_dma ? "DMA" : "PIO");
1324 else 1324 else
1325 dev_dbg(&spi->dev, "%ld Hz actual, %s\n", 1325 dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
1326 clk_get_rate(ssp->clk) / 2 1326 clk_get_rate(ssp->clk) / 2
1327 / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)), 1327 / (1 + ((chip->cr0 & SSCR0_SCR(0x0ff)) >> 8)),
1328 chip->enable_dma ? "DMA" : "PIO"); 1328 chip->enable_dma ? "DMA" : "PIO");
1329 1329
1330 if (spi->bits_per_word <= 8) { 1330 if (spi->bits_per_word <= 8) {
1331 chip->n_bytes = 1; 1331 chip->n_bytes = 1;
@@ -1558,7 +1558,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
1558 write_SSCR1(SSCR1_RxTresh(RX_THRESH_DFLT) | 1558 write_SSCR1(SSCR1_RxTresh(RX_THRESH_DFLT) |
1559 SSCR1_TxTresh(TX_THRESH_DFLT), 1559 SSCR1_TxTresh(TX_THRESH_DFLT),
1560 drv_data->ioaddr); 1560 drv_data->ioaddr);
1561 write_SSCR0(SSCR0_SerClkDiv(2) 1561 write_SSCR0(SSCR0_SCR(2)
1562 | SSCR0_Motorola 1562 | SSCR0_Motorola
1563 | SSCR0_DataSize(8), 1563 | SSCR0_DataSize(8),
1564 drv_data->ioaddr); 1564 drv_data->ioaddr);