| Message ID | 1388117724-11103-1-git-send-email-wsa@the-dreams.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3440cb28627d7fbaf25c0d60cb9c6cf6d66d61ad |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > >> 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?
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 */