[PATCH v11 3/8] ARM: edma: Add EDMA crossbar event mux support
Joel A Fernandes
agnel.joel at gmail.com
Thu Jun 20 10:36:48 EST 2013
Hi Sekhar,
Thanks for the feedback.
On Tue, Jun 18, 2013 at 5:19 AM, Sekhar Nori <nsekhar at ti.com> wrote:
> On 6/18/2013 12:08 PM, Joel A Fernandes wrote:
>> From: Matt Porter <mporter at ti.com>
>>
>> Changes by Joel:
>> * Split EDMA xbar support out of original EDMA DT parsing patch
>> to keep it easier for review.
>> * Rewrite shift and offset calculation.
>>
>> Suggested-by: Sekhar Nori <nsekhar at ti.com>
>> Suggested by: Andy Shevchenko <andy.shevchenko at gmail.com>
>> Signed-off-by: Joel A Fernandes <joelagnel at ti.com>
>>
>> Reference:
>> [1] https://patchwork.kernel.org/patch/2226991/
>> ---
>> arch/arm/common/edma.c | 59 ++++++++++++++++++++++++++++++++++++
>> include/linux/platform_data/edma.h | 1 +
>> 2 files changed, 60 insertions(+)
>>
>> diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
>> index 9823b79..1c2fb15 100644
>> --- a/arch/arm/common/edma.c
>> +++ b/arch/arm/common/edma.c
>> @@ -1410,6 +1410,52 @@ static int edma_of_read_u32_to_s16_array(const struct device_node *np,
>> return 0;
>> }
>>
>> +static int edma_xbar_event_map(struct device *dev,
>> + struct device_node *node,
>> + struct edma_soc_info *pdata, int len)
>> +{
>> + int ret = 0;
>> + int i;
>> + struct resource res;
>> + void *xbar;
>
> void __iomem *xbar;
OK.
>> + const s16 (*xbar_chans)[2];
>> + u32 shift, offset, mux;
>> +
>> + xbar_chans = devm_kzalloc(dev,
>> + len/sizeof(s16) + 2*sizeof(s16),
>> + GFP_KERNEL);
>> + if (!xbar_chans)
>> + return -ENOMEM;
>> +
>> + ret = of_address_to_resource(node, 1, &res);
>> + if (ret)
>> + return -EIO;
>> +
>> + xbar = devm_ioremap(dev, res.start, resource_size(&res));
>> + if (!xbar)
>> + return -ENOMEM;
>> +
>> + ret = edma_of_read_u32_to_s16_array(node,
>> + "ti,edma-xbar-event-map",
>> + (s16 *)xbar_chans,
>> + len/sizeof(u32));
>> + if (ret)
>> + return -EIO;
>> +
>> + for (i = 0; xbar_chans[i][0] != -1; i++) {
>> + shift = (xbar_chans[i][1] & 0x03) << 3;
>> + offset = xbar_chans[i][1] & 0xfffffffc;
>> + mux = readl((void *)((u32)xbar + offset));
>
> Please drop unnecessary casting. Simply:
Done.
>
> mux = readl(xbar + offset);
>
>> + mux &= ~(0xff << shift);
>> + mux |= xbar_chans[i][0] << shift;
>> + writel(mux, (void *)((u32)xbar + offset));
>
> Fix the writel likewise.
Done.
>> }
>>
>> + /* Clear the xbar mapped channels in unused list */
>> + xbar_chans = info[j]->xbar_chans;
>> + if (xbar_chans) {
>> + for (i = 0; xbar_chans[i][1] != -1; i++) {
>> + off = xbar_chans[i][1];
>> + clear_bits(off, 1,
>> + edma_cc[j]->edma_unused);
>
> Please fix the alignment here.
I noticed the alignment was off in a few other places in that driver.
Fixed those up too.
Thanks,
Joel
More information about the devicetree-discuss
mailing list