hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'topic/intel' into for-linus

This commit is contained in:
Vinod Koul 2018-08-17 17:57:59 +05:30
parent d0c993f6ac bbacb8e78a
commit d3df935e35
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/hsu/hsu.c
View File

@ -413,6 +413,13 @@ static void hsu_dma_free_chan_resources(struct dma_chan *chan)
vchan_free_chan_resources(to_virt_chan(chan)); vchan_free_chan_resources(to_virt_chan(chan));
} }
static void hsu_dma_synchronize(struct dma_chan *chan)
{
struct hsu_dma_chan *hsuc = to_hsu_dma_chan(chan);
vchan_synchronize(&hsuc->vchan);
}
int hsu_dma_probe(struct hsu_dma_chip *chip) int hsu_dma_probe(struct hsu_dma_chip *chip)
{ {
struct hsu_dma *hsu; struct hsu_dma *hsu;
@ -459,6 +466,7 @@ int hsu_dma_probe(struct hsu_dma_chip *chip)
hsu->dma.device_pause = hsu_dma_pause; hsu->dma.device_pause = hsu_dma_pause;
hsu->dma.device_resume = hsu_dma_resume; hsu->dma.device_resume = hsu_dma_resume;
hsu->dma.device_terminate_all = hsu_dma_terminate_all; hsu->dma.device_terminate_all = hsu_dma_terminate_all;
hsu->dma.device_synchronize = hsu_dma_synchronize;
hsu->dma.src_addr_widths = HSU_DMA_BUSWIDTHS; hsu->dma.src_addr_widths = HSU_DMA_BUSWIDTHS;
hsu->dma.dst_addr_widths = HSU_DMA_BUSWIDTHS; hsu->dma.dst_addr_widths = HSU_DMA_BUSWIDTHS;

8
drivers/dma/idma64.c
View File

@ -496,6 +496,13 @@ static int idma64_terminate_all(struct dma_chan *chan)
return 0; return 0;
} }
static void idma64_synchronize(struct dma_chan *chan)
{
struct idma64_chan *idma64c = to_idma64_chan(chan);
vchan_synchronize(&idma64c->vchan);
}
static int idma64_alloc_chan_resources(struct dma_chan *chan) static int idma64_alloc_chan_resources(struct dma_chan *chan)
{ {
struct idma64_chan *idma64c = to_idma64_chan(chan); struct idma64_chan *idma64c = to_idma64_chan(chan);
@ -583,6 +590,7 @@ static int idma64_probe(struct idma64_chip *chip)
idma64->dma.device_pause = idma64_pause; idma64->dma.device_pause = idma64_pause;
idma64->dma.device_resume = idma64_resume; idma64->dma.device_resume = idma64_resume;
idma64->dma.device_terminate_all = idma64_terminate_all; idma64->dma.device_terminate_all = idma64_terminate_all;
idma64->dma.device_synchronize = idma64_synchronize;
idma64->dma.src_addr_widths = IDMA64_BUSWIDTHS; idma64->dma.src_addr_widths = IDMA64_BUSWIDTHS;
idma64->dma.dst_addr_widths = IDMA64_BUSWIDTHS; idma64->dma.dst_addr_widths = IDMA64_BUSWIDTHS;