diff options
| author |   Lee Jones <lee.jones@linaro.org> | 2013-09-18 08:58:18 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2013-09-26 11:06:01 +0200 |
| commit | b44b66321fc222c4a653afd3dbb4bd2e9bdd523b (patch) | |
| tree | cd0d79c26b190529daab0b276a40657b70175e60 /drivers/usb/musb | |
| parent | clk: ux500: Add Device Tree support for the TWD clock (diff) | |
| download | linux-dev-b44b66321fc222c4a653afd3dbb4bd2e9bdd523b.tar.xz linux-dev-b44b66321fc222c4a653afd3dbb4bd2e9bdd523b.zip | |
usb: musb: ux500: Don't supply a con_id when requesting the clock
If we supply a con_id then the clock framework will search for that name
in MUSB's Device Tree node for the 'clock-names' property. If it's absent
the clock request will fail. However, if we don't supply the con_id then
clk_get() will call into clk_sys() which will use the device name to
search for the appropriate clock, which is much more natural than forcing
'usb'.
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/ux500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 59256b12f746..c844499e4479 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -259,7 +259,7 @@ static int ux500_probe(struct platform_device *pdev) goto err1; } - clk = clk_get(&pdev->dev, "usb"); + clk = clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { dev_err(&pdev->dev, "failed to get clock\n"); ret = PTR_ERR(clk); |