summaryrefslogtreecommitdiffstats
path: root/drivers/amba/bus.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-08-10 15:17:34 -0400
committerRussell King <rmk+kernel@armlinux.org.uk>2016-08-12 11:47:07 -0400
commitbcd3006f07ef9c80ac225854c1518c22f2f56d71 (patch)
treefad8ebebb356fd3e8d679f51b6f2e81325b7a44a /drivers/amba/bus.c
parent7619751f8c900fa5fdd76db06f4caf095c56de8e (diff)
ARM: 8596/1: amba: Support clk parents and rates assigned in DT
Add the call to of_clk_set_defaults() into the amba probe path so that devices on the amba bus can use the assigned rates and parents feature of the common clock framework. Cc: Michael Turquette <mturquette@baylibre.com> Tested-by: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/amba/bus.c')
-rw-r--r--drivers/amba/bus.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index a5b5c87e2114..a56fa2a1e9aa 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -19,6 +19,7 @@
19#include <linux/amba/bus.h> 19#include <linux/amba/bus.h>
20#include <linux/sizes.h> 20#include <linux/sizes.h>
21#include <linux/limits.h> 21#include <linux/limits.h>
22#include <linux/clk/clk-conf.h>
22 23
23#include <asm/irq.h> 24#include <asm/irq.h>
24 25
@@ -237,6 +238,10 @@ static int amba_probe(struct device *dev)
237 int ret; 238 int ret;
238 239
239 do { 240 do {
241 ret = of_clk_set_defaults(dev->of_node, false);
242 if (ret < 0)
243 break;
244
240 ret = dev_pm_domain_attach(dev, true); 245 ret = dev_pm_domain_attach(dev, true);
241 if (ret == -EPROBE_DEFER) 246 if (ret == -EPROBE_DEFER)
242 break; 247 break;