Message ID | 1363607255-6385-1-git-send-email-horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
Hi Simon On Mon, 18 Mar 2013, Simon Horman wrote: > From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Recently many pin function names have been removed, as their users have > been switched to use pinctrl. However, kzm9g-reference has been left > unchanged, which broke its compilation. Fix this by switching over to > pinctrl. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> I think, there's a problem with this one. The description doesn't match the body, this isn't my patch. Thanks Guennadi > --- > arch/arm/mach-shmobile/clock-r8a7779.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c > index 0f66d35..d9edeaf 100644 > --- a/arch/arm/mach-shmobile/clock-r8a7779.c > +++ b/arch/arm/mach-shmobile/clock-r8a7779.c > @@ -88,7 +88,7 @@ static struct clk div4_clks[DIV4_NR] = { > > enum { MSTP323, MSTP322, MSTP321, MSTP320, > MSTP115, > - MSTP101, MSTP100, > + MSTP103, MSTP101, MSTP100, > MSTP030, > MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, > MSTP016, MSTP015, MSTP014, > @@ -101,6 +101,7 @@ static struct clk mstp_clks[MSTP_NR] = { > [MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */ > [MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */ > [MSTP115] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 15, 0), /* SATA */ > + [MSTP103] = SH_CLK_MSTP32(&div4_clks[DIV4_S], MSTPCR1, 3, 0), /* DU */ > [MSTP101] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 1, 0), /* USB2 */ > [MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 0, 0), /* USB0/1 */ > [MSTP030] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 30, 0), /* I2C0 */ > @@ -184,6 +185,7 @@ static struct clk_lookup lookups[] = { > CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */ > CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */ > CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP320]), /* SDHI3 */ > + CLKDEV_DEV_ID("rcar-du.0", &mstp_clks[MSTP103]), /* DU */ > }; > > void __init r8a7779_clock_init(void) > -- > 1.7.10.4 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/
On Mon, Mar 18, 2013 at 12:58:49PM +0100, Guennadi Liakhovetski wrote: > Hi Simon > > On Mon, 18 Mar 2013, Simon Horman wrote: > > > From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > > > Recently many pin function names have been removed, as their users have > > been switched to use pinctrl. However, kzm9g-reference has been left > > unchanged, which broke its compilation. Fix this by switching over to > > pinctrl. > > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > I think, there's a problem with this one. The description doesn't match > the body, this isn't my patch. Thanks, I'll investigate.
On Mon, Mar 18, 2013 at 08:46:52PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: > > Linux 3.9-rc2 (2013-03-10 16:54:19 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.10 > > for you to fetch changes up to da8288d03cd9e22036c759c1bfb5ec91e4ad01fd: > > ARM: shmobile: fix kzm9g-reference compile breakage (2013-03-14 00:00:14 +0900) > > ---------------------------------------------------------------- > Renesas ARM-based SoC updates for v3.10 One of the patches appears to have an incorrect commit message. I will correct this and send a revised pull request.
On Monday 18 March 2013, Simon Horman wrote: > The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: > > Linux 3.9-rc2 (2013-03-10 16:54:19 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.10 > > for you to fetch changes up to da8288d03cd9e22036c759c1bfb5ec91e4ad01fd: > > ARM: shmobile: fix kzm9g-reference compile breakage (2013-03-14 00:00:14 +0900) > > ---------------------------------------------------------------- > Renesas ARM-based SoC updates for v3.10 Pulled into next/soc, thanks! It would be nice to have a bit more verbose changelog text in the tag here. Arnd
On Thu, Mar 21, 2013 at 05:01:03PM +0000, Arnd Bergmann wrote: > On Monday 18 March 2013, Simon Horman wrote: > > The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: > > > > Linux 3.9-rc2 (2013-03-10 16:54:19 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.10 > > > > for you to fetch changes up to da8288d03cd9e22036c759c1bfb5ec91e4ad01fd: > > > > ARM: shmobile: fix kzm9g-reference compile breakage (2013-03-14 00:00:14 +0900) > > > > ---------------------------------------------------------------- > > Renesas ARM-based SoC updates for v3.10 > > Pulled into next/soc, thanks! > > It would be nice to have a bit more verbose changelog text in the tag here. Thanks, I'll try not to be so economical with my words next time.