Commit bfddfb45 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dan Williams

ARM: PL08x: rename lli.next to lli.lli

The LLI pointer in the documentation is placed into the LLI register,
so name it LLI rather than 'next'.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e25761d7
...@@ -111,7 +111,7 @@ struct vendor_data { ...@@ -111,7 +111,7 @@ struct vendor_data {
struct pl08x_lli { struct pl08x_lli {
u32 src; u32 src;
u32 dst; u32 dst;
u32 next; u32 lli;
u32 cctl; u32 cctl;
}; };
...@@ -375,7 +375,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan) ...@@ -375,7 +375,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
/* /*
* A LLI pointer of 0 terminates the LLI list * A LLI pointer of 0 terminates the LLI list
*/ */
clli = llis_va[i].next; clli = llis_va[i].lli;
i++; i++;
} }
} }
...@@ -577,7 +577,7 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x, ...@@ -577,7 +577,7 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
* memory. So we don't manipulate this bit currently. * memory. So we don't manipulate this bit currently.
*/ */
llis_va[num_llis].next = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli); llis_va[num_llis].lli = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
if (cctl & PL080_CONTROL_SRC_INCR) if (cctl & PL080_CONTROL_SRC_INCR)
txd->srcbus.addr += len; txd->srcbus.addr += len;
...@@ -925,7 +925,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -925,7 +925,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
/* /*
* The final LLI terminates the LLI. * The final LLI terminates the LLI.
*/ */
llis_va[num_llis - 1].next = 0; llis_va[num_llis - 1].lli = 0;
/* /*
* The final LLI element shall also fire an interrupt * The final LLI element shall also fire an interrupt
*/ */
...@@ -934,7 +934,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -934,7 +934,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
/* Now store the channel register values */ /* Now store the channel register values */
txd->csrc = llis_va[0].src; txd->csrc = llis_va[0].src;
txd->cdst = llis_va[0].dst; txd->cdst = llis_va[0].dst;
txd->clli = llis_va[0].next; txd->clli = llis_va[0].lli;
txd->cctl = llis_va[0].cctl; txd->cctl = llis_va[0].cctl;
/* ccfg will be set at physical channel allocation time */ /* ccfg will be set at physical channel allocation time */
...@@ -950,7 +950,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, ...@@ -950,7 +950,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
llis_va[i].src, llis_va[i].src,
llis_va[i].dst, llis_va[i].dst,
llis_va[i].cctl, llis_va[i].cctl,
llis_va[i].next llis_va[i].lli
); );
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment