[PATCH] arm: shmobile: r7s72100: really add i2c clocks

[PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Wolfram Sang]

From: Wolfram Sang <wsa@sang-engineering.com>

Due to a merge conflict, addition of the clocks was lost. Tested with
RIIC2 on a genmai board. Others untested but hopefully trivial enough to
be added.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
---
 arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index e6ab0cd..dd8ce87 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -176,6 +176,10 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
 	/* MSTP clocks */
+	CLKDEV_DEV_ID("fcfee000.i2c", &mstp_clks[MSTP97]),
+	CLKDEV_DEV_ID("fcfee400.i2c", &mstp_clks[MSTP96]),
+	CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]),
+	CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]),
 	CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),
 
 	/* ICK */
-- 
1.8.5.1

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Simon Horman]

On Fri, Dec 27, 2013 at 05:15:24AM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa@sang-engineering.com>
> 
> Due to a merge conflict, addition of the clocks was lost. Tested with
> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
> be added.
> 
> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>

Thanks, I will queue this up.

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Geert Uytterhoeven]

Hi Simon,

On Mon, Jan 6, 2014 at 6:18 AM, Simon Horman <horms@verge.net.au> wrote:
> On Fri, Dec 27, 2013 at 05:15:24AM +0100, Wolfram Sang wrote:
>> From: Wolfram Sang <wsa@sang-engineering.com>
>>
>> Due to a merge conflict, addition of the clocks was lost. Tested with
>> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
>> be added.
>>
>> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
>
> Thanks, I will queue this up.

This still seems to be missing?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Simon Horman]

On Fri, Jan 10, 2014 at 02:36:41PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Mon, Jan 6, 2014 at 6:18 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Dec 27, 2013 at 05:15:24AM +0100, Wolfram Sang wrote:
> >> From: Wolfram Sang <wsa@sang-engineering.com>
> >>
> >> Due to a merge conflict, addition of the clocks was lost. Tested with
> >> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
> >> be added.
> >>
> >> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> >
> > Thanks, I will queue this up.
> 
> This still seems to be missing?

Thanks, I have now queued it up.

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]


> > >> From: Wolfram Sang <wsa@sang-engineering.com>
> > >>
> > >> Due to a merge conflict, addition of the clocks was lost. Tested with
> > >> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
> > >> be added.
> > >>
> > >> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> > >
> > > Thanks, I will queue this up.
> > 
> > This still seems to be missing?
> 
> Thanks, I have now queued it up.

It is not upstream yet?


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Simon Horman]

On Thu, Jan 30, 2014 at 10:11:33AM +0100, Wolfram Sang wrote:
> 
> > > >> From: Wolfram Sang <wsa@sang-engineering.com>
> > > >>
> > > >> Due to a merge conflict, addition of the clocks was lost. Tested with
> > > >> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
> > > >> be added.
> > > >>
> > > >> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> > > >
> > > > Thanks, I will queue this up.
> > > 
> > > This still seems to be missing?
> > 
> > Thanks, I have now queued it up.
> 
> It is not upstream yet?

Hi,

the following is in the devel branch of my renesas tree, queued up for v3.15.



From: Wolfram Sang <wsa@sang-engineering.com>

ARM: shmobile: r7s72100: really add i2c clocks

Due to a merge conflict, addition of the clocks was lost. Tested with
RIIC2 on a genmai board. Others untested but hopefully trivial enough to
be added.

Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
[horms+renesas@verge.net.au: Capitalised "ARM" in subject]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index e6ab0cd..dd8ce87 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -176,6 +176,10 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
 	/* MSTP clocks */
+	CLKDEV_DEV_ID("fcfee000.i2c", &mstp_clks[MSTP97]),
+	CLKDEV_DEV_ID("fcfee400.i2c", &mstp_clks[MSTP96]),
+	CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]),
+	CLKDEV_DEV_ID("fcfeec00.i2c", &mstp_clks[MSTP94]),
 	CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),
 
 	/* ICK */

Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

On Fri, Jan 31, 2014 at 09:00:12AM +0900, Simon Horman wrote:
> On Thu, Jan 30, 2014 at 10:11:33AM +0100, Wolfram Sang wrote:
> > 
> > > > >> From: Wolfram Sang <wsa@sang-engineering.com>
> > > > >>
> > > > >> Due to a merge conflict, addition of the clocks was lost. Tested with
> > > > >> RIIC2 on a genmai board. Others untested but hopefully trivial enough to
> > > > >> be added.
> > > > >>
> > > > >> Signed-off-by: Wolfram Sang <wsa@sang-engineering.com>
> > > > >
> > > > > Thanks, I will queue this up.
> > > > 
> > > > This still seems to be missing?
> > > 
> > > Thanks, I have now queued it up.
> > 
> > It is not upstream yet?

Ah, okay. Well, I'd think this is a bugfix for

d85bcfa916ffdf078f188aeab60f738b290f4309 arm: shmobile: r7s72100: add i2c clocks

since without it i2c can't be used with 3.14. But your call, after all.

Thanks,

    Wolfram


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]