Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c511dc1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull slave-dmaengine update from Vinod Koul:
 "This time we have a new dmaengine driver from the tegra folks.  Also
  we have Guennadi's cleanup of sh drivers which incudes a library for
  sh drivers.  And the usual odd fixes in bunch of drivers and some nice
  cleanup of dw_dmac from Andy."

Fix up conflicts in drivers/mmc/host/sh_mmcif.c

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Cleanup logging messages
  mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
  dma: sh: provide a migration path for slave drivers to stop using .private
  dma: sh: use an integer slave ID to improve API compatibility
  dmaengine: shdma: prepare to stop using struct dma_chan::private
  sh: remove unused DMA device pointer from SIU platform data
  ASoC: siu: don't use DMA device for channel filtering
  dmaengine: shdma: (cosmetic) simplify a static function
  dmaengine: at_hdmac: add a few const qualifiers
  dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
  dw_dmac: mark dwc_dump_lli inline
  dma: mxs-dma: Export missing symbols from mxs-dma.c
  dma: shdma: convert to the shdma base library
  ASoC: fsi: prepare for conversion to the shdma base library
  usb: renesas_usbhs: prepare for conversion to the shdma base library
  ASoC: siu: prepare for conversion to the shdma base library
  serial: sh-sci: prepare for conversion to the shdma base library
  mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
  mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
  dma: shdma: prepare for conversion to the shdma base library
  ...
parents 9161c3b7 63433250

arch/sh/include/asm/siu.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
struct device;

struct device;





struct siu_platform {

struct siu_platform {

	struct device *dma_dev;

	unsigned int dma_slave_tx_a;

	unsigned int dma_slave_tx_a;

	unsigned int dma_slave_rx_a;

	unsigned int dma_slave_rx_a;

	unsigned int dma_slave_tx_b;

	unsigned int dma_slave_tx_b;

arch/sh/kernel/cpu/sh4a/setup-sh7722.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -512,7 +512,6 @@ static struct platform_device tmu2_device = { 
};

};





static struct siu_platform siu_platform_data = {

static struct siu_platform siu_platform_data = {

	.dma_dev	= &dma_device.dev,

	.dma_slave_tx_a	= SHDMA_SLAVE_SIUA_TX,

	.dma_slave_tx_a	= SHDMA_SLAVE_SIUA_TX,

	.dma_slave_rx_a	= SHDMA_SLAVE_SIUA_RX,

	.dma_slave_rx_a	= SHDMA_SLAVE_SIUA_RX,

	.dma_slave_tx_b	= SHDMA_SLAVE_SIUB_TX,

	.dma_slave_tx_b	= SHDMA_SLAVE_SIUB_TX,

drivers/dma/Kconfig

+25 −1
Original line number Original line Diff line number Diff line
@@ -148,6 +148,20 @@ config TXX9_DMAC 
	  Support the TXx9 SoC internal DMA controller.  This can be

	  Support the TXx9 SoC internal DMA controller.  This can be

	  integrated in chips such as the Toshiba TX4927/38/39.

	  integrated in chips such as the Toshiba TX4927/38/39.





config TEGRA20_APB_DMA

	bool "NVIDIA Tegra20 APB DMA support"

	depends on ARCH_TEGRA

	select DMA_ENGINE

	help

	  Support for the NVIDIA Tegra20 APB DMA controller driver. The

	  DMA controller is having multiple DMA channel which can be

	  configured for different peripherals like audio, UART, SPI,

	  I2C etc which is in APB bus.

	  This DMA controller transfers data from memory to peripheral fifo

	  or vice versa. It does not support memory to memory data transfer.







config SH_DMAE

config SH_DMAE

	tristate "Renesas SuperH DMAC support"

	tristate "Renesas SuperH DMAC support"

	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)

	depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
@@ -237,7 +251,7 @@ config IMX_DMA 




config MXS_DMA

config MXS_DMA

	bool "MXS DMA support"

	bool "MXS DMA support"

	depends on SOC_IMX23 || SOC_IMX28

	depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q

	select STMP_DEVICE

	select STMP_DEVICE

	select DMA_ENGINE

	select DMA_ENGINE

	help

	help
@@ -260,6 +274,16 @@ config DMA_SA11X0 
	  SA-1110 SoCs.  This DMA engine can only be used with on-chip

	  SA-1110 SoCs.  This DMA engine can only be used with on-chip

	  devices.

	  devices.





config MMP_TDMA

	bool "MMP Two-Channel DMA support"

	depends on ARCH_MMP

	select DMA_ENGINE

	help

	  Support the MMP Two-Channel DMA engine.

	  This engine used for MMP Audio DMA and pxa910 SQU.



	  Say Y here if you enabled MMP ADMA, otherwise say N.



config DMA_ENGINE

config DMA_ENGINE

	bool

	bool

drivers/dma/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ obj-$(CONFIG_DW_DMAC) += dw_dmac.o 
obj-$(CONFIG_AT_HDMAC) += at_hdmac.o

obj-$(CONFIG_AT_HDMAC) += at_hdmac.o

obj-$(CONFIG_MX3_IPU) += ipu/

obj-$(CONFIG_MX3_IPU) += ipu/

obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o

obj-$(CONFIG_SH_DMAE) += shdma.o

obj-$(CONFIG_SH_DMAE) += sh/

obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o

obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o

obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/

obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/

obj-$(CONFIG_IMX_SDMA) += imx-sdma.o

obj-$(CONFIG_IMX_SDMA) += imx-sdma.o
@@ -23,8 +23,10 @@ obj-$(CONFIG_MXS_DMA) += mxs-dma.o 
obj-$(CONFIG_TIMB_DMA) += timb_dma.o

obj-$(CONFIG_TIMB_DMA) += timb_dma.o

obj-$(CONFIG_SIRF_DMA) += sirf-dma.o

obj-$(CONFIG_SIRF_DMA) += sirf-dma.o

obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o

obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o

obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o

obj-$(CONFIG_PL330_DMA) += pl330.o

obj-$(CONFIG_PL330_DMA) += pl330.o

obj-$(CONFIG_PCH_DMA) += pch_dma.o

obj-$(CONFIG_PCH_DMA) += pch_dma.o

obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o

obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o

obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o

obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o

obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o

obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o

obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o

drivers/dma/at_hdmac.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -9,10 +9,9 @@ 
 * (at your option) any later version.

 * (at your option) any later version.

 *

 *

 *

 *

 * This supports the Atmel AHB DMA Controller,

 * This supports the Atmel AHB DMA Controller found in several Atmel SoCs.

 *

 * The only Atmel DMA Controller that is not covered by this driver is the one

 * The driver has currently been tested with the Atmel AT91SAM9RL

 * found on AT91SAM9263.

 * and AT91SAM9G45 series.

 */

 */





#include <linux/clk.h>

#include <linux/clk.h>
@@ -1217,7 +1216,7 @@ static const struct platform_device_id atdma_devtypes[] = { 
	}

	}

};

};





static inline struct at_dma_platform_data * __init at_dma_get_driver_data(

static inline const struct at_dma_platform_data * __init at_dma_get_driver_data(

						struct platform_device *pdev)

						struct platform_device *pdev)

{

{

	if (pdev->dev.of_node) {

	if (pdev->dev.of_node) {
@@ -1255,7 +1254,7 @@ static int __init at_dma_probe(struct platform_device *pdev) 
	int			irq;

	int			irq;

	int			err;

	int			err;

	int			i;

	int			i;

	struct at_dma_platform_data *plat_dat;

	const struct at_dma_platform_data *plat_dat;





	/* setup platform data for each SoC */

	/* setup platform data for each SoC */

	dma_cap_set(DMA_MEMCPY, at91sam9rl_config.cap_mask);

	dma_cap_set(DMA_MEMCPY, at91sam9rl_config.cap_mask);