diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:03:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 11:03:31 +1100 |
| commit | dc6ad0d0dd483b5b865a8338a64410d23e652e4d (patch) | |
| tree | 1e9e21c1ebd1be00c0f229d1abf7e38a68570e47 /drivers/usb/host | |
| parent | f3ecb8767880f59235ab8f131f183ace8518ff21 (diff) | |
| parent | 8c699054e9954d1a6fc7ecc18011a6e6fafd99ae (diff) | |
Merge remote-tracking branch 'mpc5xxx/next'
Conflicts:
arch/powerpc/boot/dts/mpc5125twr.dts
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/fsl-mph-dr-of.c | 13 |
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) struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev); struct clk *clk; int err; - char clk_name[10]; - int base, clk_num; - - base = pdev->resource->start & 0xf000; - if (base == 0x3000) - clk_num = 1; - else if (base == 0x4000) - clk_num = 2; - else - return -ENODEV; - snprintf(clk_name, sizeof(clk_name), "usb%d_clk", clk_num); - clk = devm_clk_get(pdev->dev.parent, clk_name); + clk = devm_clk_get(pdev->dev.parent, "ipg"); if (IS_ERR(clk)) { dev_err(&pdev->dev, "failed to get clk\n"); return PTR_ERR(clk); |