From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH] arm: shmobile: r7s72100: really add i2c clocks
Date: Fri, 31 Jan 2014 00:00:12 +0000 [thread overview]
Message-ID: <20140131000010.GA14663@verge.net.au> (raw)
In-Reply-To: <1388117724-11103-1-git-send-email-wsa@the-dreams.de>
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 */
next prev parent reply other threads:[~2014-01-31 0:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-27 4:15 [PATCH] arm: shmobile: r7s72100: really add i2c clocks Wolfram Sang
2014-01-06 5:18 ` Simon Horman
2014-01-10 13:36 ` Geert Uytterhoeven
2014-01-13 0:27 ` Simon Horman
2014-01-30 9:11 ` Wolfram Sang
2014-01-31 0:00 ` Simon Horman [this message]
2014-01-31 7:42 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140131000010.GA14663@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).