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

Commit 4554c135 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  i.MX SDMA: Fix burstsize settings
  ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
  dma: sh_dma: not all SH DMAC implementations support MEMCPY
  at_hdmac: bugfix for enabling channel irq
  dmaengine: fix missing 'cnt' in ?: in dmatest
parents 82bdc843 94ac27a5

arch/arm/mach-shmobile/setup-sh7372.c

+2 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = { 
	.dmaor_is_32bit	= 1,

	.needs_tend_set	= 1,

	.no_dmars	= 1,

	.slave_only	= 1,

};



static struct resource sh7372_usb_dmae0_resources[] = {
@@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = { 
	.dmaor_is_32bit	= 1,

	.needs_tend_set	= 1,

	.no_dmars	= 1,

	.slave_only	= 1,

};



static struct resource sh7372_usb_dmae1_resources[] = {

drivers/dma/at_hdmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int __init at_dma_probe(struct platform_device *pdev) 


		tasklet_init(&atchan->tasklet, atc_tasklet,

				(unsigned long)atchan);

		atc_enable_irq(atchan);

		atc_enable_chan_irq(atdma, i);

	}



	/* set base routines */
@@ -1410,7 +1410,7 @@ static int __exit at_dma_remove(struct platform_device *pdev) 
		struct at_dma_chan	*atchan = to_at_dma_chan(chan);



		/* Disable interrupts */

		atc_disable_irq(atchan);

		atc_disable_chan_irq(atdma, chan->chan_id);

		tasklet_disable(&atchan->tasklet);



		tasklet_kill(&atchan->tasklet);

drivers/dma/at_hdmac_regs.h

+8 −9
Original line number Diff line number Diff line
@@ -327,28 +327,27 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli) 
}





static void atc_setup_irq(struct at_dma_chan *atchan, int on)

static void atc_setup_irq(struct at_dma *atdma, int chan_id, int on)

{

	struct at_dma	*atdma = to_at_dma(atchan->chan_common.device);

	u32 ebci;



	/* enable interrupts on buffer transfer completion & error */

	ebci =    AT_DMA_BTC(atchan->chan_common.chan_id)

		| AT_DMA_ERR(atchan->chan_common.chan_id);

	ebci =    AT_DMA_BTC(chan_id)

		| AT_DMA_ERR(chan_id);

	if (on)

		dma_writel(atdma, EBCIER, ebci);

	else

		dma_writel(atdma, EBCIDR, ebci);

}



static inline void atc_enable_irq(struct at_dma_chan *atchan)

static void atc_enable_chan_irq(struct at_dma *atdma, int chan_id)

{

	atc_setup_irq(atchan, 1);

	atc_setup_irq(atdma, chan_id, 1);

}



static inline void atc_disable_irq(struct at_dma_chan *atchan)

static void atc_disable_chan_irq(struct at_dma *atdma, int chan_id)

{

	atc_setup_irq(atchan, 0);

	atc_setup_irq(atdma, chan_id, 0);

}

drivers/dma/dmatest.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan) 
	}

	if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {

		cnt = dmatest_add_threads(dtc, DMA_PQ);

		thread_count += cnt > 0 ?: 0;

		thread_count += cnt > 0 ? cnt : 0;

	}



	pr_info("dmatest: Started %u threads using %s\n",

drivers/dma/imx-sdma.c

+4 −2
Original line number Diff line number Diff line
@@ -1102,11 +1102,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
	case DMA_SLAVE_CONFIG:

		if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {

			sdmac->per_address = dmaengine_cfg->src_addr;

			sdmac->watermark_level = dmaengine_cfg->src_maxburst;

			sdmac->watermark_level = dmaengine_cfg->src_maxburst *

						dmaengine_cfg->src_addr_width;

			sdmac->word_size = dmaengine_cfg->src_addr_width;

		} else {

			sdmac->per_address = dmaengine_cfg->dst_addr;

			sdmac->watermark_level = dmaengine_cfg->dst_maxburst;

			sdmac->watermark_level = dmaengine_cfg->dst_maxburst *

						dmaengine_cfg->dst_addr_width;

			sdmac->word_size = dmaengine_cfg->dst_addr_width;

		}

		sdmac->direction = dmaengine_cfg->direction;