aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGerhard Sittig <gsi@denx.de>2013-11-30 17:51:31 -0500
committerAnatolij Gustschin <agust@denx.de>2014-01-12 12:53:05 -0500
commitd77276c432c4513e99a0ae9150e9110eeab63dc5 (patch)
tree77664c4b9e594e8940ff7c0a768ac4ad57eee812 /drivers/usb
parentcb1ea81230f0b5593b847d2cb3d9304e1d5e4234 (diff)
USB: fsl-mph-dr-of: adjust for OF based clock lookup
after device tree based clock lookup became available, the peripheral driver need no longer construct clock names which include the component index -- remove the "usb%d_clk" template, always use "ipg" instead Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb@vger.kernel.org Signed-off-by: Gerhard Sittig <gsi@denx.de> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/fsl-mph-dr-of.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index abd5050a4899..9162d1b6c0a3 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -261,19 +261,8 @@ int fsl_usb2_mpc5121_init(struct platform_device *pdev)
261 struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev); 261 struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
262 struct clk *clk; 262 struct clk *clk;
263 int err; 263 int err;
264 char clk_name[10];
265 int base, clk_num;
266
267 base = pdev->resource->start & 0xf000;
268 if (base == 0x3000)
269 clk_num = 1;
270 else if (base == 0x4000)
271 clk_num = 2;
272 else
273 return -ENODEV;
274 264
275 snprintf(clk_name, sizeof(clk_name), "usb%d_clk", clk_num); 265 clk = devm_clk_get(pdev->dev.parent, "ipg");
276 clk = devm_clk_get(pdev->dev.parent, clk_name);
277 if (IS_ERR(clk)) { 266 if (IS_ERR(clk)) {
278 dev_err(&pdev->dev, "failed to get clk\n"); 267 dev_err(&pdev->dev, "failed to get clk\n");
279 return PTR_ERR(clk); 268 return PTR_ERR(clk);