2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
linux-next/drivers/spi
Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine update from Vinod Koul:
 "This includes the cookie cleanup by Russell, the addition of context
  parameter for dmaengine APIs, more arm dmaengine driver cleanup by
  moving code to dmaengine, this time for imx by Javier and pl330 by
  Boojin along with the usual driver fixes."

Fix up some fairly trivial conflicts with various other cleanups.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
  dmaengine: imx: fix the build failure on x86_64
  dmaengine: i.MX: Fix merge of cookie branch.
  dmaengine: i.MX: Add support for interleaved transfers.
  dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
  dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
  dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
  dmaengine: imx-dma: remove internal structure.
  dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
  dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
  dmaengine: imx-dma: remove sg member from internal structure.
  dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
  dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
  dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
  dmaengine: imx-dma: remove dma_mode member of internal structure.
  dmaengine: imx-dma: remove data member from internal structure.
  dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
  dmaengine: at_hdmac: add slave config operation
  dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
  dmaengine/dma_slave: introduce inline wrappers
  dma: imx-sdma: Treat firmware messages as warnings instead of erros
  ...
2012-03-29 15:34:57 -07:00
..
Kconfig ARM: global cleanups 2012-03-27 16:03:32 -07:00
Makefile spi: add Broadcom BCM63xx SPI controller driver 2012-03-09 15:03:03 -07:00
spi-altera.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-ath79.c spi/ath79: fix compile error due to missing include 2011-12-07 21:57:49 +01:00
spi-atmel.c atmel/spi: fix missing probe 2011-11-09 23:02:12 +08:00
spi-au1550.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-bcm63xx.c spi: add Broadcom BCM63xx SPI controller driver 2012-03-09 15:03:03 -07:00
spi-bfin5xx.c spi: irq: Remove IRQF_DISABLED 2011-10-24 14:14:40 +02:00
spi-bfin-sport.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02: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 drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-davinci.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02: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: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-09 15:33:15 -07:00
spi-dw.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-dw.h spi: spi-dw: fix all sparse warnings 2011-09-21 09:41:48 -06:00
spi-ep93xx.c dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
spi-fsl-espi.c spi/fsl-espi: Make sure pm is within 2..32 2012-03-15 15:14:24 -06:00
spi-fsl-lib.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-fsl-lib.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-fsl-spi.c spi: Fix WARN when removing spi-fsl-spi module 2011-09-23 17:28:29 -06:00
spi-gpio.c spi/gpio: fix section mismatch warning 2011-12-07 22:17:39 +01:00
spi-imx.c spi/imx: simplify error handling to free gpios 2012-03-09 16:26:48 -07:00
spi-lm70llp.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-mpc52xx-psc.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-mpc52xx.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-mpc512x-psc.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-nuc900.c spi/nuc900: Remove unnecessary memset of struct nuc900_spi 2012-02-01 17:10:52 -07:00
spi-oc-tiny.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-omap2-mcspi.c spi/omap: Add DT support to McSPI driver 2012-02-15 12:57:00 -07:00
spi-omap-100k.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-omap-uwire.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
spi-orion.c ARM: orion: spi: remove enable_clock_fix which is not used 2012-03-16 04:28:40 +00:00
spi-pl022.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
spi-ppc4xx.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-pxa2xx-pci.c spi: Convert to DEFINE_PCI_DEVICE_TABLE 2012-03-09 15:33:15 -07:00
spi-pxa2xx.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-rspi.c spi: add support for Renesas RSPI 2012-03-07 19:18:49 -07:00
spi-s3c24xx-fiq.h spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx-fiq.S spi: reorganize drivers 2011-06-06 01:16:30 -06:00
spi-s3c24xx.c ARM: S3C24XX: move spi-s3c24xx platdata out of mach 2012-01-31 20:06:27 +09:00
spi-s3c64xx.c spi: s3c64xx: Fix build 2012-03-15 03:32:17 -06:00
spi-sh-hspi.c spi: sh-hspi: modify write/read method 2012-03-15 03:41:50 -06: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: add CSR SiRFprimaII SPI controller driver 2012-03-09 14:51:11 -07:00
spi-stmp.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi-tegra.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02: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: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-topcliff-pch.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
spi-txx9.c spi: Add module.h to implicit users in drivers/spi 2011-10-31 19:32:17 -04:00
spi-xilinx.c drivercore: Add helper macro for platform_driver boilerplate 2011-10-25 00:35:47 +02:00
spi.c spi: remove redundant variable assignment 2012-03-15 03:30:33 -06:00
spidev.c spi: reorganize drivers 2011-06-06 01:16:30 -06:00