Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756031Ab3FRKVI (ORCPT ); Tue, 18 Jun 2013 06:21:08 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:40405 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754437Ab3FRKVF (ORCPT ); Tue, 18 Jun 2013 06:21:05 -0400 Message-ID: <51C0344F.6010709@ti.com> Date: Tue, 18 Jun 2013 15:49:59 +0530 From: Sekhar Nori User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Joel A Fernandes CC: Tony Lindgren , Matt Porter , Grant Likely , Rob Herring , Vinod Koul , Mark Brown , Benoit Cousson , Russell King , Rob Landley , Andrew Morton , Jason Kridner , Koen Kooi , Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann Subject: Re: [PATCH v11 3/8] ARM: edma: Add EDMA crossbar event mux support References: <1371537499-12970-1-git-send-email-joelagnel@ti.com> <1371537499-12970-4-git-send-email-joelagnel@ti.com> In-Reply-To: <1371537499-12970-4-git-send-email-joelagnel@ti.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3584 Lines: 126 On 6/18/2013 12:08 PM, Joel A Fernandes wrote: > From: Matt Porter > > 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 > Suggested by: Andy Shevchenko > Signed-off-by: Joel A Fernandes > > 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; > + 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: mux = readl(xbar + offset); > + mux &= ~(0xff << shift); > + mux |= xbar_chans[i][0] << shift; > + writel(mux, (void *)((u32)xbar + offset)); Fix the writel likewise. > + } > + > + pdata->xbar_chans = xbar_chans; > + > + return 0; > +} > + > static int edma_of_parse_dt(struct device *dev, > struct device_node *node, > struct edma_soc_info *pdata) > @@ -1470,6 +1516,9 @@ static int edma_of_parse_dt(struct device *dev, > > pdata->default_queue = 0; > > + prop = of_find_property(node, "ti,edma-xbar-event-map", &sz); > + if (prop) > + ret = edma_xbar_event_map(dev, node, pdata, sz); > > return ret; > } > @@ -1489,6 +1538,7 @@ static int edma_probe(struct platform_device *pdev) > int status = -1; > const s16 (*rsv_chans)[2]; > const s16 (*rsv_slots)[2]; > + const s16 (*xbar_chans)[2]; > int irq[EDMA_MAX_CC] = {0, 0}; > int err_irq[EDMA_MAX_CC] = {0, 0}; > struct resource *r[EDMA_MAX_CC] = {NULL, NULL}; > @@ -1617,6 +1667,15 @@ static int edma_probe(struct platform_device *pdev) > } > } > > + /* 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. Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/