linux-sg2042/drivers/spi
Linus Torvalds b7e97d2211 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "This time we have Andy updates on dw_dmac which is attempting to make
  this IP block available as PCI and platform device though not fully
  complete this time.

  We also have TI EDMA moving the dma driver to use dmaengine APIs, also
  have a new driver for mmp-tdma, along with bunch of small updates.

  Now for your excitement the merge is little unusual here, while
  merging the auto merge on linux-next picks wrong choice for pl330
  (drivers/dma/pl330.c) and this causes build failure.  The correct
  resolution is in linux-next.  (DMA: PL330: Fix build error) I didn't
  back merge your tree this time as you are better than me so no point
  in doing that for me :)"

Fixed the pl330 conflict as in linux-next, along with trivial header
file conflicts due to changed includes.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
  dma: tegra: fix interrupt name issue with apb dma.
  dw_dmac: fix a regression in dwc_prep_dma_memcpy
  dw_dmac: introduce software emulation of LLP transfers
  dw_dmac: autoconfigure data_width or get it via platform data
  dw_dmac: autoconfigure block_size or use platform data
  dw_dmac: get number of channels from hardware if possible
  dw_dmac: fill optional encoded parameters in register structure
  dw_dmac: mark dwc_dump_chan_regs as inline
  DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources
  DMA: PL330: Remove redundant runtime_suspend/resume functions
  DMA: PL330: Remove controller clock enable/disable
  dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
  dma: tegra: use list_move_tail instead of list_del/list_add_tail
  mxs/dma: Enlarge the CCW descriptor area to 4 pages
  dw_dmac: utilize slave_id to pass request line
  dmaengine: mmp_tdma: add dt support
  dmaengine: mmp-pdma support
  spi: davici - make davinci select edma
  ...
2012-10-10 11:10:41 +09:00
..
Kconfig Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-10-10 11:10:41 +09:00
Makefile Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-10-09 16:08:04 +09:00
spi-altera.c spi: spi-altera: Use of_match_ptr 2012-08-17 22:56:18 +01:00
spi-ath79.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-atmel.c atmel/spi: fix missing probe 2011-11-09 23:02:12 +08:00
spi-au1550.c spi: fix comment/printk typos in spi 2012-09-01 08:53:27 -07:00
spi-bcm63xx.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-08-25 11:45:04 -07:00
spi-bfin-sport.c spi: fix comment/printk typos in spi 2012-09-01 08:53:27 -07:00
spi-bfin5xx.c spi/spi-bfin5xx: Fix flush of last bit after each spi transfer 2012-04-27 12:20:39 -06:00
spi-bitbang-txrx.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-bitbang.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-butterfly.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-coldfire-qspi.c spi/coldfire-qspi: Drop extra calls to spi_master_get in suspend/resume functions 2012-08-17 22:46:41 +01:00
spi-davinci.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-10-10 11:10:41 +09:00
spi-dw-mid.c dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
spi-dw-mmio.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-dw-pci.c spi: use module_pci_driver 2012-04-10 14:11:34 -06:00
spi-dw.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
spi-dw.h spi: spi-dw: fix all sparse warnings 2011-09-21 09:41:48 -06:00
spi-ep93xx.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
spi-falcon.c SPI: MIPS: lantiq: add FALCON spi driver 2012-07-23 13:56:30 +01:00
spi-fsl-espi.c spi/devicetree: Move devicetree support code into spi directory 2012-04-13 10:21:39 -06:00
spi-fsl-lib.c spi/devicetree: Move devicetree support code into spi directory 2012-04-13 10:21:39 -06:00
spi-fsl-lib.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-fsl-spi.c spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control 2012-05-19 23:12:06 -06:00
spi-gpio.c spi/gpio: Fix stub for spi_gpio_probe_dt() 2012-09-07 08:23:06 +08:00
spi-imx.c spi: Updates for v3.7 2012-10-02 17:26:42 -07:00
spi-lm70llp.c spi: By default setup spi_masters with 1 chipselect and dynamics bus number 2012-05-19 23:42:08 -06:00
spi-mpc52xx-psc.c spi/mpc52xx-psc: Avoid access to freed memory in device remove function 2012-08-22 19:26:36 +01:00
spi-mpc52xx.c spi/mpc52xx: Fix device remove function 2012-08-22 19:26:36 +01:00
spi-mpc512x-psc.c spi/mpc512x-psc: Avoid access to freed memory in device remove function 2012-08-22 19:26:36 +01:00
spi-mxs.c spi/mxs: Make the SPI block clock speed configurable via DT 2012-09-06 07:45:53 +08:00
spi-nuc900.c ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
spi-oc-tiny.c spi: fix comment/printk typos in spi 2012-09-01 08:53:27 -07:00
spi-octeon.c spi: Add SPI master controller for OCTEON SOCs. 2012-08-22 23:46:38 +02:00
spi-omap-100k.c SPI: OMAP: remove unnecessary includes of plat/clock.h 2012-09-22 10:50:01 -06:00
spi-omap-uwire.c ARM: OMAP1: Make plat/mux.h omap1 only 2012-09-20 14:54:57 -07:00
spi-omap2-mcspi.c ARM: soc: late platform updates 2012-10-07 20:55:16 +09:00
spi-orion.c spi: Refactor spi-orion to use SPI framework queue. 2012-08-17 22:56:18 +01:00
spi-pl022.c spi/pl022: get/put resources on suspend/resume 2012-09-28 14:05:07 +01:00
spi-ppc4xx.c spi: fix comment/printk typos in spi 2012-09-01 08:53:27 -07:00
spi-pxa2xx-pci.c spi: use module_pci_driver 2012-04-10 14:11:34 -06:00
spi-pxa2xx.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-rspi.c spi/rspi: add dmaengine support 2012-05-19 22:37:16 -06:00
spi-s3c24xx-fiq.S spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx.c drivers/spi/spi-s3c24xx.c: fix error return code 2012-08-22 17:58:01 +01:00
spi-s3c64xx.c Devicetree updates for 3.7 2012-10-03 09:44:08 -07:00
spi-sc18is602.c spi/sc18is602: Return -EINVAL for probe failures due to I2C function mismatch 2012-08-23 12:13:54 +01:00
spi-sh-hspi.c spi: spi-sh-hspi: drop frees of devm_ alloc'd data 2012-09-06 07:44:19 +08:00
spi-sh-msiof.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-sh-sci.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-sh.c spi/spi-sh: add IORESOURCE_MEM_TYPE_MASK decoding for access size 2012-03-07 19:18:45 -07:00
spi-sirf.c SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors 2012-05-19 23:17:31 -06:00
spi-stmp.c spi/stmp: Fix device remove function 2012-08-27 09:37:52 -07:00
spi-ti-ssp.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-tle62x0.c spi: spi-tle62x0: Use module_spi_driver macro 2012-09-06 07:43:15 +08:00
spi-topcliff-pch.c spi: Updates for v3.7 2012-10-02 17:26:42 -07:00
spi-txx9.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-xcomm.c spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver 2012-07-20 11:08:44 +01:00
spi-xilinx.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi.c spi: Add "spi:" prefix to modalias attribute of spi devices 2012-05-20 20:14:48 -06:00
spidev.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00