aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/amba-pl08x.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-03 17:36:50 -0500
committerDan Williams <dan.j.williams@intel.com>2011-01-04 22:16:11 -0500
commit4c0df6a3ce8eb947647c7ed2640d0172936d8ef3 (patch)
tree4763f62c3f64754864cc8afd70a8792b9ef24008 /drivers/dma/amba-pl08x.c
parent19386b3234fdbe4d33492574d83e63a8dace18d3 (diff)
ARM: PL08x: don't assume that the LLI pointer has the bus bit clear
We only want use the address of the LLI pointer when locating the corresponding structure in memory, so clear the master bus selection bit. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
-rw-r--r--drivers/dma/amba-pl08x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 78c84b3f903d..1081165d01a3 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -356,7 +356,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
356 if (ch && txd) { 356 if (ch && txd) {
357 struct pl08x_lli *llis_va = txd->llis_va; 357 struct pl08x_lli *llis_va = txd->llis_va;
358 struct pl08x_lli *llis_bus = (struct pl08x_lli *) txd->llis_bus; 358 struct pl08x_lli *llis_bus = (struct pl08x_lli *) txd->llis_bus;
359 u32 clli = readl(ch->base + PL080_CH_LLI); 359 u32 clli = readl(ch->base + PL080_CH_LLI) & ~PL080_LLI_LM_AHB2;
360 360
361 /* First get the bytes in the current active LLI */ 361 /* First get the bytes in the current active LLI */
362 bytes = get_bytes_in_cctl(readl(ch->base + PL080_CH_CONTROL)); 362 bytes = get_bytes_in_cctl(readl(ch->base + PL080_CH_CONTROL));