diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-08-10 21:17:34 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-12 17:47:07 +0200 |
| commit | bcd3006f07ef9c80ac225854c1518c22f2f56d71 (patch) | |
| tree | fad8ebebb356fd3e8d679f51b6f2e81325b7a44a /drivers/amba/bus.c | |
| parent | ARM: 8595/2: apply more __ro_after_init (diff) | |
| download | linux-bcd3006f07ef9c80ac225854c1518c22f2f56d71.tar.xz linux-bcd3006f07ef9c80ac225854c1518c22f2f56d71.zip | |
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.c | 5 |
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 @@ #include <linux/amba/bus.h> #include <linux/sizes.h> #include <linux/limits.h> +#include <linux/clk/clk-conf.h> #include <asm/irq.h> @@ -237,6 +238,10 @@ static int amba_probe(struct device *dev) int ret; do { + ret = of_clk_set_defaults(dev->of_node, false); + if (ret < 0) + break; + ret = dev_pm_domain_attach(dev, true); if (ret == -EPROBE_DEFER) break; |