mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
Merge branch 'topic/hsu' into for-linus
This commit is contained in:
commit
8dfc27af62
2 changed files with 9 additions and 3 deletions
|
@ -77,8 +77,8 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)
|
|||
hsu_chan_writel(hsuc, HSU_CH_MTSR, mtsr);
|
||||
|
||||
/* Set descriptors */
|
||||
count = (desc->nents - desc->active) % HSU_DMA_CHAN_NR_DESC;
|
||||
for (i = 0; i < count; i++) {
|
||||
count = desc->nents - desc->active;
|
||||
for (i = 0; i < count && i < HSU_DMA_CHAN_NR_DESC; i++) {
|
||||
hsu_chan_writel(hsuc, HSU_CH_DxSAR(i), desc->sg[i].addr);
|
||||
hsu_chan_writel(hsuc, HSU_CH_DxTSR(i), desc->sg[i].len);
|
||||
|
||||
|
@ -160,7 +160,7 @@ irqreturn_t hsu_dma_irq(struct hsu_dma_chip *chip, unsigned short nr)
|
|||
return IRQ_NONE;
|
||||
|
||||
/* Timeout IRQ, need wait some time, see Errata 2 */
|
||||
if (hsuc->direction == DMA_DEV_TO_MEM && (sr & HSU_CH_SR_DESCTO_ANY))
|
||||
if (sr & HSU_CH_SR_DESCTO_ANY)
|
||||
udelay(2);
|
||||
|
||||
sr &= ~HSU_CH_SR_DESCTO_ANY;
|
||||
|
@ -417,6 +417,8 @@ int hsu_dma_probe(struct hsu_dma_chip *chip)
|
|||
|
||||
hsu->dma.dev = chip->dev;
|
||||
|
||||
dma_set_max_seg_size(hsu->dma.dev, HSU_CH_DxTSR_MASK);
|
||||
|
||||
ret = dma_async_device_register(&hsu->dma);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
@ -55,6 +55,10 @@
|
|||
#define HSU_CH_DCR_CHEI BIT(23)
|
||||
#define HSU_CH_DCR_CHTOI(x) BIT(24 + (x))
|
||||
|
||||
/* Bits in HSU_CH_DxTSR */
|
||||
#define HSU_CH_DxTSR_MASK GENMASK(15, 0)
|
||||
#define HSU_CH_DxTSR_TSR(x) ((x) & HSU_CH_DxTSR_MASK)
|
||||
|
||||
struct hsu_dma_sg {
|
||||
dma_addr_t addr;
|
||||
unsigned int len;
|
||||
|
|
Loading…
Reference in a new issue