linux-toradex.git/drivers/spi, branch v3.18-rc5

Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus

2014-11-06T12:58:46+00:00

spi: pxa2xx: toggle clocks on suspend if not disabled by runtime PM

2014-11-06T12:54:00+00:00

If PM_RUNTIME is enabled, it is easy to trigger the following backtrace
on pxa2xx hosts:

------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at /home/lumag/linux/arch/arm/mach-pxa/clock.c:35 clk_disable+0xa0/0xa8()
Modules linked in:
CPU: 0 PID: 1 Comm: swapper Not tainted 3.17.0-00007-g1b3d2ee-dirty #104
[] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[] (show_stack) from [] (warn_slowpath_common+0x6c/0x8c)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x1c/0x24)
[] (warn_slowpath_null) from [] (clk_disable+0xa0/0xa8)
[] (clk_disable) from [] (pxa2xx_spi_suspend+0x2c/0x34)
[] (pxa2xx_spi_suspend) from [] (platform_pm_suspend+0x2c/0x54)
[] (platform_pm_suspend) from [] (dpm_run_callback.isra.14+0x2c/0x74)
[] (dpm_run_callback.isra.14) from [] (__device_suspend+0x120/0x2f8)
[] (__device_suspend) from [] (dpm_suspend+0x50/0x208)
[] (dpm_suspend) from [] (suspend_devices_and_enter+0x8c/0x3a0)
[] (suspend_devices_and_enter) from [] (pm_suspend+0x214/0x2a8)
[] (pm_suspend) from [] (test_suspend+0x14c/0x1dc)
[] (test_suspend) from [] (do_one_initcall+0x8c/0x1fc)
[] (do_one_initcall) from [] (kernel_init_freeable+0xf4/0x1b4)
[] (kernel_init_freeable) from [] (kernel_init+0x8/0xec)
[] (kernel_init) from [] (ret_from_fork+0x14/0x24)
---[ end trace 46524156d8faa4f6 ]---

This happens because suspend function tries to disable a clock that is
already disabled by runtime_suspend callback. Add if
(!pm_runtime_suspended()) checks to suspend/resume path.

Fixes: 7d94a505858 (spi/pxa2xx: add support for runtime PM)
Signed-off-by: Dmitry Eremin-Solenikov 
Reported-by: Andrea Adami 
Signed-off-by: Mark Brown 
Cc: stable@vger.kernel.org

spi: fsl-dspi: Fix CTAR selection

2014-11-04T10:52:08+00:00

There are only 4 CTAR registers (CTAR0 - CTAR3) so we can only use the
lower 2 bits of the chip select to select a CTAR register.
SPI_PUSHR_CTAS used the lower 3 bits which would result in wrong bit values
if the chip selects 4/5 are used. For those chip selects SPI_CTAR even
calculated offsets of non-existing registers.

Signed-off-by: Alexander Stein 
Signed-off-by: Mark Brown 
Cc: stable@vger.kernel.org

Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/orion', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/spidev' into spi-linus

2014-10-27T11:26:54+00:00

spi: orion: fix potential NULL pointer de-reference

2014-10-22T10:05:54+00:00

It's possible that the call to of_match_device() (introduced in commit
df59fa7f ["spi: orion: support armada extended baud rates"]) may return
a NULL if there is no match in the device tree (or perhaps no device tree
at all). Check the return pointer and set the local device data to the
lowest common denominator orion device data if it is NULL.

Reported-by: Karl Beldan 
Signed-off-by: Greg Ungerer 
Signed-off-by: Mark Brown

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-10-19T01:11:04+00:00

Pull slave-dmaengine updates from Vinod Koul:
 "For dmaengine contributions we have:
   - designware cleanup by Andy
   - my series moving device_control users to dmanegine_xxx APIs for
     later removal of device_control API
   - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
     etc"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
  serial: atmel: add missing dmaengine header
  dmaengine: remove FSLDMA_EXTERNAL_START
  dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
  carma-fpga: move to fsl_dma_external_start()
  carma-fpga: use dmaengine_xxx() API
  dmaengine: freescale: add and export fsl_dma_external_start()
  dmaengine: add dmaengine_prep_dma_sg() helper
  video: mx3fb: use dmaengine_terminate_all() API
  serial: sh-sci: use dmaengine_terminate_all() API
  net: ks8842: use dmaengine_terminate_all() API
  mtd: sh_flctl: use dmaengine_terminate_all() API
  mtd: fsmc_nand: use dmaengine_terminate_all() API
  V4L2: mx3_camer: use dmaengine_pause() API
  dmaengine: coh901318: use dmaengine_terminate_all() API
  pata_arasan_cf: use dmaengine_terminate_all() API
  dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
  dmaengine: dw: export probe()/remove() and Co to users
  dmaengine: dw: enable and disable controller when needed
  dmaengine: dw: always export dw_dma_{en,dis}able
  dmaengine: dw: introduce dw_dma_on() helper
  ...

spi/rockchip: spi controller must be disabled in tx callback too

2014-10-17T12:29:22+00:00

Signed-off-by: Addy Ke 
Signed-off-by: Mark Brown

spi/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode

2014-10-15T13:05:38+00:00

In rx mode, dma must be prepared before spi is enabled.
But in tx and tr mode, spi must be enabled first.

Signed-off-by: Addy Ke 
Signed-off-by: Mark Brown

spi/rockchip: fix bug that case spi can't go as fast as slave request

2014-10-15T13:05:38+00:00

Because the minimum divisor in rk3x's spi controller is 2,
if spi_clk is less than 2 * sclk_out, we can't get the right divisor.
So we must set spi_clk again to match slave request.

Signed-off-by: Addy Ke 
Signed-off-by: Mark Brown

spi: pl022: Fix incorrect dma_unmap_sg

2014-10-13T11:08:35+00:00

When mapped RX DMA entries are unmapped in an error condition when DMA
is firstly configured in the driver, the number of TX DMA entries was
passed in, which is incorrect

Signed-off-by: Ray Jui 
Signed-off-by: Mark Brown 
Cc: stable@vger.kernel.org