[PATCH] amba: Support clk parents and rates assigned in DT

[PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

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.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Russell,

Can you please ack this change? We're going to send it through the clk tree
because hisi clock requires it.

Thanks,
Stephen

 drivers/amba/bus.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index f0099360039e..350ed93d4281 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;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

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.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Russell,

Can you please ack this change? We're going to send it through the clk tree
because hisi clock requires it.

Thanks,
Stephen

 drivers/amba/bus.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index f0099360039e..350ed93d4281 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;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

On 05/28/2015 01:52 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.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---

Shall I put this into the patch tracker? Turns out it wasn't needed for
the hisi stuff immediately.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

On 05/28/2015 01:52 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.
>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---

Shall I put this into the patch tracker? Turns out it wasn't needed for
the hisi stuff immediately.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Bintian]

Hi Russell,

Could you spend several minutes to review Stephen's patch?

Thanks,

Bintian

On 2015/7/7 7:57, Stephen Boyd wrote:
> On 05/28/2015 01:52 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.
>>
>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
>> ---
>
> Shall I put this into the patch tracker? Turns out it wasn't needed for
> the hisi stuff immediately.
>

[PATCH] amba: Support clk parents and rates assigned in DT

[Bintian]

Hi Russell,

Could you spend several minutes to review Stephen's patch?

Thanks,

Bintian

On 2015/7/7 7:57, Stephen Boyd wrote:
> On 05/28/2015 01:52 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.
>>
>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
>> ---
>
> Shall I put this into the patch tracker? Turns out it wasn't needed for
> the hisi stuff immediately.
>

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Russell King - ARM Linux]

On Tue, Jul 07, 2015 at 04:47:33PM +0800, Bintian wrote:
> Hi Russell,
> 
> Could you spend several minutes to review Stephen's patch?

Sorry, I'm busy this week, I need to sort out my git tree, get some fixes
out which should've been pushed during the merge window, and other stuff.
I'm not going to have much time to read email, let alone do reviews.
Please be patient.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

[PATCH] amba: Support clk parents and rates assigned in DT

[Russell King - ARM Linux]

On Tue, Jul 07, 2015 at 04:47:33PM +0800, Bintian wrote:
> Hi Russell,
> 
> Could you spend several minutes to review Stephen's patch?

Sorry, I'm busy this week, I need to sort out my git tree, get some fixes
out which should've been pushed during the merge window, and other stuff.
I'm not going to have much time to read email, let alone do reviews.
Please be patient.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Bintian]

On 2015/7/7 17:33, Russell King - ARM Linux wrote:
> On Tue, Jul 07, 2015 at 04:47:33PM +0800, Bintian wrote:
>> Hi Russell,
>>
>> Could you spend several minutes to review Stephen's patch?
>
> Sorry, I'm busy this week, I need to sort out my git tree, get some fixes
> out which should've been pushed during the merge window, and other stuff.
> I'm not going to have much time to read email, let alone do reviews.
> Please be patient.
>
No problem, just keep your own pace.

Thanks,

Bintian

[PATCH] amba: Support clk parents and rates assigned in DT

[Bintian]

On 2015/7/7 17:33, Russell King - ARM Linux wrote:
> On Tue, Jul 07, 2015 at 04:47:33PM +0800, Bintian wrote:
>> Hi Russell,
>>
>> Could you spend several minutes to review Stephen's patch?
>
> Sorry, I'm busy this week, I need to sort out my git tree, get some fixes
> out which should've been pushed during the merge window, and other stuff.
> I'm not going to have much time to read email, let alone do reviews.
> Please be patient.
>
No problem, just keep your own pace.

Thanks,

Bintian

[PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

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;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH] amba: Support clk parents and rates assigned in DT

[Stephen Boyd]

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;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Jorge Ramirez]

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;

[PATCH] amba: Support clk parents and rates assigned in DT

[Jorge Ramirez]

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;

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Jorge Ramirez]

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

[PATCH] amba: Support clk parents and rates assigned in DT

[Jorge Ramirez]

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

Re: [PATCH] amba: Support clk parents and rates assigned in DT

[Russell King - ARM Linux]

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.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

[PATCH] amba: Support clk parents and rates assigned in DT

[Russell King - ARM Linux]

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.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.