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

Commit e7211718 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'fixes' into next

parents ba793233 c8ddf036

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/shdma.c

+2 −1
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev) 


	INIT_LIST_HEAD(&shdev->common.channels);



	if (!pdata->slave_only)

		dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);

	if (pdata->slave && pdata->slave_num)

		dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);

include/linux/sh_dma.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct sh_dmae_pdata { 
	unsigned int needs_tend_set:1;

	unsigned int no_dmars:1;

	unsigned int chclr_present:1;

	unsigned int slave_only:1;

};



/* DMA register */