On 02/14/2014 03:33 PM, Lee Jones wrote: >>>> Use a meaningful name for the reference clocks so that it indicates the function. >>>> >>>> CC: Lee Jones <lee.jones@xxxxxxxxxx> >>>> CC: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> >>>> Signed-off-by: Roger Quadros <rogerq@xxxxxx> >>>> --- >>>> drivers/mfd/omap-usb-host.c | 6 +++--- >>>> 1 file changed, 3 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c >>>> index 60a3bed..ce620a8 100644 >>>> --- a/drivers/mfd/omap-usb-host.c >>>> +++ b/drivers/mfd/omap-usb-host.c >>>> @@ -714,21 +714,21 @@ static int usbhs_omap_probe(struct platform_device *pdev) >>>> goto err_mem; >>>> } >>>> >>>> - omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck"); >>>> + omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1"); >>> >>> You can't do that. These changes will have to be in the same patch as >>> the core change i.e. where they are initialised. >> >> I'm not touching them anywhere in this series. When core changes are you >> referring to? > > The ones in: > arch/arm/mach-omap2/cclock3xxx_data.c OK, right. They are now no longer needed so I'll get rid of them. In fact that change should either be in a separate patch or combined with PATCH 2 in this series. What do you suggest? cheers, -roger > >>>> if (IS_ERR(omap->xclk60mhsp1_ck)) { >>>> ret = PTR_ERR(omap->xclk60mhsp1_ck); >>>> dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret); >>>> goto err_mem; >>>> } >>>> >>>> - omap->xclk60mhsp2_ck = devm_clk_get(dev, "xclk60mhsp2_ck"); >>>> + omap->xclk60mhsp2_ck = devm_clk_get(dev, "refclk_60m_ext_p2"); >>>> if (IS_ERR(omap->xclk60mhsp2_ck)) { >>>> ret = PTR_ERR(omap->xclk60mhsp2_ck); >>>> dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret); >>>> goto err_mem; >>>> } >>>> >>>> - omap->init_60m_fclk = devm_clk_get(dev, "init_60m_fclk"); >>>> + omap->init_60m_fclk = devm_clk_get(dev, "refclk_60m_int"); >>>> if (IS_ERR(omap->init_60m_fclk)) { >>>> ret = PTR_ERR(omap->init_60m_fclk); >>>> dev_err(dev, "init_60m_fclk failed error:%d\n", ret); >>> >> > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html