On Wed, Nov 14, 2012 at 03:39:11PM +0200, Alexander Shishkin wrote: > Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> writes: > > > From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > > > This patch adds support for ahb, ipg and per clock, which is needed to support > > imx53. > > I would also suggest using a more elaborate wording here, some people > might also be interested what are the different clocks for (like, > interface, peripheral, etc etc). > Will do in V2. > > > > Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > > Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> > > --- > > drivers/usb/chipidea/usbmisc_imx.c | 60 +++++++++++++++++++++++++++--------- > > 1 file changed, 45 insertions(+), 15 deletions(-) > > > > diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c > > index 72445f7..239b752 100644 > > --- a/drivers/usb/chipidea/usbmisc_imx.c > > +++ b/drivers/usb/chipidea/usbmisc_imx.c > > @@ -24,7 +24,9 @@ > > struct imx_usbmisc { > > void __iomem *base; > > spinlock_t lock; > > - struct clk *clk; > > + struct clk *clk_ahb; > > + struct clk *clk_ipg; > > + struct clk *clk_per; > > struct usbmisc_usb_device usbdev[USB_DEV_MAX]; > > const struct usbmisc_ops *ops; > > }; > > @@ -104,38 +106,66 @@ static int __devinit usbmisc_imx_probe(struct platform_device *pdev) > > if (!data->base) > > return -EADDRNOTAVAIL; > > > > - data->clk = devm_clk_get(&pdev->dev, NULL); > > - if (IS_ERR(data->clk)) { > > + data->clk_ahb = devm_clk_get(&pdev->dev, "ahb"); > > I suppose the clock names are also being added/changed in the platform > code in another patchset that's also being queued? What's the target > merge window (if there's a dependency)? Yes we have more branches to be published next. One of them is adding the usb device tree nodes and clock entries for mx53. Thanks, Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html