Merge branch 'fixes' into next
This commit is contained in:
commit
e7211718b3
|
@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = {
|
||||||
.dmaor_is_32bit = 1,
|
.dmaor_is_32bit = 1,
|
||||||
.needs_tend_set = 1,
|
.needs_tend_set = 1,
|
||||||
.no_dmars = 1,
|
.no_dmars = 1,
|
||||||
|
.slave_only = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct resource sh7372_usb_dmae0_resources[] = {
|
static struct resource sh7372_usb_dmae0_resources[] = {
|
||||||
|
@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = {
|
||||||
.dmaor_is_32bit = 1,
|
.dmaor_is_32bit = 1,
|
||||||
.needs_tend_set = 1,
|
.needs_tend_set = 1,
|
||||||
.no_dmars = 1,
|
.no_dmars = 1,
|
||||||
|
.slave_only = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct resource sh7372_usb_dmae1_resources[] = {
|
static struct resource sh7372_usb_dmae1_resources[] = {
|
||||||
|
|
|
@ -1262,7 +1262,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
INIT_LIST_HEAD(&shdev->common.channels);
|
INIT_LIST_HEAD(&shdev->common.channels);
|
||||||
|
|
||||||
dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
|
if (!pdata->slave_only)
|
||||||
|
dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
|
||||||
if (pdata->slave && pdata->slave_num)
|
if (pdata->slave && pdata->slave_num)
|
||||||
dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
|
dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
|
||||||
|
|
||||||
|
|
|
@ -70,6 +70,7 @@ struct sh_dmae_pdata {
|
||||||
unsigned int needs_tend_set:1;
|
unsigned int needs_tend_set:1;
|
||||||
unsigned int no_dmars:1;
|
unsigned int no_dmars:1;
|
||||||
unsigned int chclr_present:1;
|
unsigned int chclr_present:1;
|
||||||
|
unsigned int slave_only:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* DMA register */
|
/* DMA register */
|
||||||
|
|
Loading…
Reference in a new issue