| 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.
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 ---------------------------------------------------------------- Bastian Hecht (1): ARM: mach-shmobile: r8a7740: Add DT names to clock list Guennadi Liakhovetski (3): ARM: shmobile: add MMCIF and SDHI DT clock aliases to sh73a0 and r8a7740 ARM: shmobile: sh73a0: fix Z and ZG clock hierarchy ARM: shmobile: fix kzm9g-reference compile breakage Kuninori Morimoto (6): ARM: shmobile: add gic_iid macro for ICCIAR / interrupt ID ARM: shmobile: r8a7779: fixup dtsi typo ARM: shmobile: r8a7779: fixup DT machine name ARM: shmobile: r8a7779: use gic_iid macro ARM: shmobile: tidyup chip series definition order for r8a7740/r8a7779 ARM: shmobile: r8a7779: add Thermal support on DT Magnus Damm (21): ARM: shmobile: Remove unused headers from hotplug.c ARM: shmobile: Remove partial CPU Hotplug from EMEV2 ARM: shmobile: Move EMEV2 CPU boot vector setup code ARM: shmobile: Remove sh73a0_get_core_count() ARM: shmobile: Remove r8a7779_get_core_count() ARM: shmobile: Remove emev2_get_core_count() ARM: shmobile: Kill off sh73a0 scu_base_addr() function ARM: shmobile: Kill off r8a7779 scu_base_addr() function ARM: shmobile: Rework EMEV2 scu_base variable ARM: shmobile: Move headsmp-sh73a0.S to headsmp-scu.S ARM: shmobile: Common shmobile_scu_base in headsmp-scu.S ARM: shmobile: Update EMEV2 to use scu_power_mode() ARM: shmobile: Make EMEV2 setup functions static ARM: shmobile: Fix base address readout in headsmp-scu.S ARM: shmobile: Rework SH73A0_SCU_BASE IOMEM() usage ARM: shmobile: Use R8A7779_SCU_BASE with TWD ARM: shmobile: Update r8a7779 to check SCU for hotplug ARM: shmobile: Update r8a7779 to use scu_power_mode() ARM: shmobile: Use sh73a0-specific cpu disable code ARM: shmobile: Rearrange r8a7779 cpu hotplug code ARM: shmobile: Remove unused hotplug.c Sergei Shtylyov (1): ARM: shmobile: R8A7779: use gic_iid() in SATA IRQ resource Simon Horman (9): ARM: mach-shmobile: r8a7779: Allow initialisation of GIC by DT ARM: mach-shmobile: r8a7779: Minimal setup using DT ARM: shmobile: sh73a0: Remove sh73a0_init_irq_dt() ARM: shmobile: sh73a0: Add smp ops to DT_MACHINE_START ARM: shmobile: sh73a0: Remove warning about SMP ARM: shmobile: sh73a0: Do not use early devices with DT reference ARM: shmobile: r8a7779: Do not use early devices with DT reference ARM: shmobile: r8a7779: Do not initialise i2c as an early device ARM: shmobile: r8a7779: Remove lan from dtsi Vladimir Barinov (2): ARM: mach-shmobile: r8a7779: SATA DT configuration ARM: mach-shmobile: r8a7779: add SATA support arch/arm/boot/dts/r8a7779.dtsi | 98 +++++++++++++++ arch/arm/mach-shmobile/Makefile | 7 +- arch/arm/mach-shmobile/clock-r8a7740.c | 13 ++ arch/arm/mach-shmobile/clock-r8a7779.c | 8 +- arch/arm/mach-shmobile/clock-sh73a0.c | 7 +- .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 ++- arch/arm/mach-shmobile/hotplug.c | 68 ----------- arch/arm/mach-shmobile/include/mach/common.h | 21 ++-- arch/arm/mach-shmobile/include/mach/irqs.h | 1 + arch/arm/mach-shmobile/intc-r8a7779.c | 27 +++- arch/arm/mach-shmobile/intc-sh73a0.c | 8 -- arch/arm/mach-shmobile/setup-emev2.c | 4 +- arch/arm/mach-shmobile/setup-r8a7779.c | 104 +++++++++++++--- arch/arm/mach-shmobile/setup-sh73a0.c | 36 ++---- arch/arm/mach-shmobile/smp-emev2.c | 86 ++----------- arch/arm/mach-shmobile/smp-r8a7779.c | 129 ++++++++++---------- arch/arm/mach-shmobile/smp-sh73a0.c | 36 +++--- 17 files changed, 355 insertions(+), 313 deletions(-) create mode 100644 arch/arm/boot/dts/r8a7779.dtsi rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%) delete mode 100644 arch/arm/mach-shmobile/hotplug.c