On Thu, Mar 07, 2013 at 08:42:18AM +0200, Andy Shevchenko wrote: > On Wed, Mar 6, 2013 at 6:15 PM, Matt Porter <mporter@xxxxxx> wrote: > > Adds support for parsing the TI EDMA DT data into the > > required EDMA private API platform data. Enables runtime > > PM support to initialize the EDMA hwmod. Adds AM33XX EDMA > > crossbar event mux support. Enables build on OMAP. > > > --- a/arch/arm/common/edma.c > > +++ b/arch/arm/common/edma.c > > > +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; > > + 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] % 4) * 8; > > Looks like shift = (xbar_chans[i][1] & 0x03) << 3; Yes, will update. > > + offset = xbar_chans[i][1] >> 2; > > + offset <<= 2; > > Is it offset = xbar_chans[i][1] & 0xfffc; ? Yes, will update > > + mux = readl((void *)((u32)xbar + offset)); > > + mux &= ~(0xff << shift); > > + mux |= xbar_chans[i][0] << shift; > > + writel(mux, (void *)((u32)xbar + offset)); > > + } > > > -- > With Best Regards, > Andy Shevchenko > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@xxxxxxxxxxxxxxxx > https://lists.ozlabs.org/listinfo/devicetree-discuss -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html