Merge remote-tracking branch 'agust/next' into next

<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>

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);