[PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Nobuhiro Iwamatsu]

Current FSI clock of ecovec uses legacy clock.
This update to non-legacy.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index c31d228..88ea26a 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -288,7 +288,7 @@ static struct platform_device ceu1_device = {
  * So, we should change parent of fsi
  */
 #define FCLKACR		0xa4150008
-static void fsimck_init(struct clk *clk)
+static int fsimck_enable(struct clk *clk)
 {
 	u32 status = __raw_readl(clk->enable_reg);
 
@@ -296,10 +296,22 @@ static void fsimck_init(struct clk *clk)
 	status &= ~0x000000ff;
 	status |= 0x00000080;
 	__raw_writel(status, clk->enable_reg);
+
+	return 0;
+}
+
+static void fsimck_disable(struct clk *clk)
+{
+	u32 status = __raw_readl(clk->enable_reg);
+
+	/* use external clock */
+	status &= ~0x00000080;
+	__raw_writel(status, clk->enable_reg);
 }
 
 static struct clk_ops fsimck_clk_ops = {
-	.init = fsimck_init,
+	.enable = fsimck_enable,
+	.disable = fsimck_disable,
 };
 
 static struct clk fsimcka_clk = {
-- 
1.7.2.3

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Paul Mundt]

On Fri, Dec 03, 2010 at 01:16:57PM +0900, Nobuhiro Iwamatsu wrote:
> Current FSI clock of ecovec uses legacy clock.
> This update to non-legacy.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> ---
>  arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
>  1 files changed, 14 insertions(+), 2 deletions(-)
> 
For ecovec and 7724 clock framework we already have the patch from
Morimoto-san queued up, perhaps se7724 needs the same fix?

	http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Kuninori Morimoto]

Dear Paul, Iwamatsu-san

> > Current FSI clock of ecovec uses legacy clock.
> > This update to non-legacy.
> > 
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> > ---
> >  arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
> >  1 files changed, 14 insertions(+), 2 deletions(-)
> > 
> For ecovec and 7724 clock framework we already have the patch from
> Morimoto-san queued up, perhaps se7724 needs the same fix?
> 
> 	http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3

Ohh... I'm sorry.
I forgot to modify mach-se/7724/setup.c in above patch.

>> Iwamatsu san

Can you update it ?

Best regards
--
Kuninori Morimoto
 

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Kuninori Morimoto]

Dear Paul, Iwamatsu-san

> > Current FSI clock of ecovec uses legacy clock.
> > This update to non-legacy.
> > 
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> > ---
> >  arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
> >  1 files changed, 14 insertions(+), 2 deletions(-)
> > 
> For ecovec and 7724 clock framework we already have the patch from
> Morimoto-san queued up, perhaps se7724 needs the same fix?
> 
> 	http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3

Ohh... I'm sorry.
I forgot to modify mach-se/7724/setup.c in above patch.

>> Iwamatsu san

Can you update it ?

Best regards
--
Kuninori Morimoto
 

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Nobuhiro Iwamatsu]

2010/12/3 Paul Mundt <lethal@linux-sh.org>:
> On Fri, Dec 03, 2010 at 01:16:57PM +0900, Nobuhiro Iwamatsu wrote:
>> Current FSI clock of ecovec uses legacy clock.
>> This update to non-legacy.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>> ---
>>  arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
>>  1 files changed, 14 insertions(+), 2 deletions(-)
>>
> For ecovec and 7724 clock framework we already have the patch from
> Morimoto-san queued up, perhaps se7724 needs the same fix?
>
>        http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3

Oh, sorry. These are the same revisions.
Please ignore.

BTW , do yuo have plan that  morimoto-san patch into linus/master?
These cannot build now by your commit
(549015c36baadc6e67861bba6e927259e34c4d59).

Best regards,
  Nobuhiro.


-- 
Nobuhiro Iwamatsu

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Nobuhiro Iwamatsu]

Hi,

2010/12/3 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
>
> Dear Paul, Iwamatsu-san
>
>> > Current FSI clock of ecovec uses legacy clock.
>> > This update to non-legacy.
>> >
>> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>> > ---
>> >  arch/sh/boards/mach-se/7724/setup.c |   16 ++++++++++++++--
>> >  1 files changed, 14 insertions(+), 2 deletions(-)
>> >
>> For ecovec and 7724 clock framework we already have the patch from
>> Morimoto-san queued up, perhaps se7724 needs the same fix?
>>
>>       http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3
>
> Ohh... I'm sorry.
> I forgot to modify mach-se/7724/setup.c in above patch.
>
>>> Iwamatsu san
>
> Can you update it ?

Sure. Please wait.

Best regards,
  Nobuhiro
-- 
Nobuhiro Iwamatsu

Re: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy

[Paul Mundt]

On Fri, Dec 03, 2010 at 01:42:30PM +0900, Nobuhiro Iwamatsu wrote:
> 2010/12/3 Paul Mundt <lethal@linux-sh.org>:
> > On Fri, Dec 03, 2010 at 01:16:57PM +0900, Nobuhiro Iwamatsu wrote:
> >> Current FSI clock of ecovec uses legacy clock.
> >> This update to non-legacy.
> >>
> >> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> >> ---
> >> ?arch/sh/boards/mach-se/7724/setup.c | ? 16 ++++++++++++++--
> >> ?1 files changed, 14 insertions(+), 2 deletions(-)
> >>
> > For ecovec and 7724 clock framework we already have the patch from
> > Morimoto-san queued up, perhaps se7724 needs the same fix?
> >
> > ? ? ? ?http://git.kernel.org/?p=linux/kernel/git/lethal/sh-2.6.git;a=commitdiff;hKd5d259e451d35380de2fcd1a3510ae22d000a3
> 
> Oh, sorry. These are the same revisions.
> Please ignore.
> 
> BTW , do yuo have plan that  morimoto-san patch into linus/master?
> These cannot build now by your commit
> (549015c36baadc6e67861bba6e927259e34c4d59).
> 
They're in my sh-fixes-for-linus branch, so they'll be heading to Linus
for -rc5. I was planning on sending out -rc5 pull requests later this
afternoon.