From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Fri, 14 Feb 2014 10:09:15 +0000 Subject: [PATCH v7 03/12] mfd: omap-usb-host: Use clock names as per function for reference clocks In-Reply-To: <1392200333-28397-4-git-send-email-rogerq@ti.com> References: <1392200333-28397-1-git-send-email-rogerq@ti.com> <1392200333-28397-4-git-send-email-rogerq@ti.com> Message-ID: <20140214100915.GD7380@lee--X1> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org > Use a meaningful name for the reference clocks so that it indicates the function. > > CC: Lee Jones > CC: Samuel Ortiz > Signed-off-by: Roger Quadros > --- > 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. > 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); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog