diff mbox

amba: Support clk parents and rates assigned in DT

Message ID 20160711210852.31553-1-sboyd@codeaurora.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Boyd July 11, 2016, 9:08 p.m. UTC
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>
Cc: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/amba/bus.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jorge Ramirez-Ortiz July 12, 2016, 12:39 a.m. UTC | #1
On 07/11/2016 11:08 PM, Stephen Boyd wrote:
> 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>
> Cc: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

Tested-by: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org>

> ---
>   drivers/amba/bus.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> 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;
Jorge Ramirez-Ortiz Aug. 19, 2016, 6:52 a.m. UTC | #2
On 07/11/2016 11:08 PM, Stephen Boyd wrote:
> 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>
> Cc: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>   drivers/amba/bus.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> 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;

Stephen/Russell,

what is the status of this patch? has it been merged?

thanks

Jorge
Russell King (Oracle) Aug. 19, 2016, 7:53 a.m. UTC | #3
On Fri, Aug 19, 2016 at 08:52:35AM +0200, Jorge Ramirez wrote:
> On 07/11/2016 11:08 PM, Stephen Boyd wrote:
> >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>
> >Cc: Jorge Ramirez Ortiz <jorge.ramirez-ortiz@linaro.org>
> >Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> >---
> >  drivers/amba/bus.c | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> >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;
> 
> Stephen/Russell,
> 
> what is the status of this patch? has it been merged?

I assume by that comment that you don't follow linux-next.  Please
follow and test linux-next, so you can check for any regressions
that may occur for your platforms in the next merge window, thanks.

You'll find the above patch in linux-next already.
diff mbox

Patch

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;