Browse Source

Merge tag 'spi-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fix from Mark Brown:
 "A single bugfix from the merge window, fixing an issue with DMA at
  slow speeds on Intel hardware"

* tag 'spi-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi/pxa2xx: change default supported DMA burst size to 1
Linus Torvalds 11 years ago
parent
commit
66a521bdda
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/spi/spi-pxa2xx-dma.c

+ 1 - 1
drivers/spi/spi-pxa2xx-dma.c

@@ -368,7 +368,7 @@ int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
 	 * otherwise we use the default. Also we use the default FIFO
 	 * otherwise we use the default. Also we use the default FIFO
 	 * thresholds for now.
 	 * thresholds for now.
 	 */
 	 */
-	*burst_code = chip_info ? chip_info->dma_burst_size : 16;
+	*burst_code = chip_info ? chip_info->dma_burst_size : 1;
 	*threshold = SSCR1_RxTresh(RX_THRESH_DFLT)
 	*threshold = SSCR1_RxTresh(RX_THRESH_DFLT)
 		   | SSCR1_TxTresh(TX_THRESH_DFLT);
 		   | SSCR1_TxTresh(TX_THRESH_DFLT);