aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2012-11-26 20:16:39 +0100
committerJason Cooper <jason@lakedaemon.net>2013-01-07 16:19:02 +0000
commitba607b6238a1f418c45b9d7f73212bcc6922da53 (patch)
tree8ad82b1783bbf6e448a82b6f6e941d235ae86387
parentdb7d77e6a7a60dbbac34fe59bc38bc8e7e5e1380 (diff)
downloadvexpress-lsk-ba607b6238a1f418c45b9d7f73212bcc6922da53.tar.gz
pinctrl: mvebu: make pdma clock on dove mandatory
With the ability to pass clocks through DT, now make the pdma clock of dove pinctrl mandatory. Otherwise, pinctrl will hang the system when accessing some registers. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-dove.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 40c9c3eecd9..9cc219f6100 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -595,8 +595,11 @@ static int __devinit dove_pinctrl_probe(struct platform_device *pdev)
* grab clk to make sure it is ticking.
*/
clk = devm_clk_get(&pdev->dev, NULL);
- if (!IS_ERR(clk))
- clk_prepare_enable(clk);
+ if (IS_ERR(clk)) {
+ dev_err(&pdev->dev, "Unable to get pdma clock");
+ return PTR_RET(clk);
+ }
+ clk_prepare_enable(clk);
return mvebu_pinctrl_probe(pdev);
}