* [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
@ 2012-11-26 6:01 Kuninori Morimoto
2012-11-26 6:23 ` Paul Mundt
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2012-11-26 6:01 UTC (permalink / raw)
To: linux-sh
764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
(sh: clkfwk: Use shared sh_clk_div_enable/disable())
shared enable/disable funcions for div4/div6.
But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
which is required on div6 clock.
This patch fixes it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Paul
This is v2 patch of sh_clk_div_disable() bugfix.
it used SH_CLK_DIV6_MSK as you indicated.
Sorry for my late response.
drivers/sh/clk/cpg.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index 07e9fb4..d118bac 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -126,6 +126,12 @@ static int sh_clk_div_set_rate(struct clk *clk, unsigned long rate)
static int sh_clk_div_enable(struct clk *clk)
{
+ if (clk->div_mask = SH_CLK_DIV6_MSK) {
+ int ret = sh_clk_div_set_rate(clk, clk->rate);
+ if (ret < 0)
+ return ret;
+ }
+
sh_clk_write(sh_clk_read(clk) & ~CPG_CKSTP_BIT, clk);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
@ 2012-11-26 6:23 ` Paul Mundt
2012-11-27 0:45 ` Kuninori Morimoto
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Paul Mundt @ 2012-11-26 6:23 UTC (permalink / raw)
To: linux-sh
On Sun, Nov 25, 2012 at 10:01:46PM -0800, Kuninori Morimoto wrote:
> 764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
> (sh: clkfwk: Use shared sh_clk_div_enable/disable())
> shared enable/disable funcions for div4/div6.
> But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
> which is required on div6 clock.
> This patch fixes it.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Looks better, I'll queue it up, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
2012-11-26 6:23 ` Paul Mundt
@ 2012-11-27 0:45 ` Kuninori Morimoto
2012-11-27 1:33 ` Paul Mundt
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2012-11-27 0:45 UTC (permalink / raw)
To: linux-sh
Hi Paul
> > 764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
> > (sh: clkfwk: Use shared sh_clk_div_enable/disable())
> > shared enable/disable funcions for div4/div6.
> > But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
> > which is required on div6 clock.
> > This patch fixes it.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Looks better, I'll queue it up, thanks.
Thanks.
Is it possible to go to v3.7-rcX ?
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
2012-11-26 6:23 ` Paul Mundt
2012-11-27 0:45 ` Kuninori Morimoto
@ 2012-11-27 1:33 ` Paul Mundt
2013-01-11 1:30 ` Kuninori Morimoto
2013-01-11 11:59 ` Paul Mundt
4 siblings, 0 replies; 6+ messages in thread
From: Paul Mundt @ 2012-11-27 1:33 UTC (permalink / raw)
To: linux-sh
On Mon, Nov 26, 2012 at 04:45:45PM -0800, Kuninori Morimoto wrote:
>
> Hi Paul
>
> > > 764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
> > > (sh: clkfwk: Use shared sh_clk_div_enable/disable())
> > > shared enable/disable funcions for div4/div6.
> > > But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
> > > which is required on div6 clock.
> > > This patch fixes it.
> > >
> > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Looks better, I'll queue it up, thanks.
>
> Thanks.
> Is it possible to go to v3.7-rcX ?
>
Yes, should be fine.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
` (2 preceding siblings ...)
2012-11-27 1:33 ` Paul Mundt
@ 2013-01-11 1:30 ` Kuninori Morimoto
2013-01-11 11:59 ` Paul Mundt
4 siblings, 0 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2013-01-11 1:30 UTC (permalink / raw)
To: linux-sh
Hi Paul
I still couldn't find this patch on linus/master branch.
What is current status of this ?
At Tue, 27 Nov 2012 10:33:38 +0900,
Paul Mundt wrote:
>
> On Mon, Nov 26, 2012 at 04:45:45PM -0800, Kuninori Morimoto wrote:
> >
> > Hi Paul
> >
> > > > 764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
> > > > (sh: clkfwk: Use shared sh_clk_div_enable/disable())
> > > > shared enable/disable funcions for div4/div6.
> > > > But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
> > > > which is required on div6 clock.
> > > > This patch fixes it.
> > > >
> > > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > >
> > > Looks better, I'll queue it up, thanks.
> >
> > Thanks.
> > Is it possible to go to v3.7-rcX ?
> >
> Yes, should be fine.
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
` (3 preceding siblings ...)
2013-01-11 1:30 ` Kuninori Morimoto
@ 2013-01-11 11:59 ` Paul Mundt
4 siblings, 0 replies; 6+ messages in thread
From: Paul Mundt @ 2013-01-11 11:59 UTC (permalink / raw)
To: linux-sh
On Thu, Jan 10, 2013 at 05:30:25PM -0800, Kuninori Morimoto wrote:
>
> Hi Paul
>
> I still couldn't find this patch on linus/master branch.
> What is current status of this ?
>
Looks like it got missed, possibly when I was shuffling trees and
machines around. I've queued it up now.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-11 11:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-26 6:01 [PATCH v2] sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6 Kuninori Morimoto
2012-11-26 6:23 ` Paul Mundt
2012-11-27 0:45 ` Kuninori Morimoto
2012-11-27 1:33 ` Paul Mundt
2013-01-11 1:30 ` Kuninori Morimoto
2013-01-11 11:59 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).