From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guennadi Liakhovetski Date: Mon, 18 Mar 2013 11:58:49 +0000 Subject: Re: [PATCH 43/43] ARM: shmobile: fix kzm9g-reference compile breakage Message-Id: List-Id: References: <1363607255-6385-1-git-send-email-horms+renesas@verge.net.au> <1363607255-6385-44-git-send-email-horms+renesas@verge.net.au> In-Reply-To: <1363607255-6385-44-git-send-email-horms+renesas@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org Hi Simon On Mon, 18 Mar 2013, Simon Horman wrote: > From: Guennadi Liakhovetski > > 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 > Signed-off-by: Simon Horman 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/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: g.liakhovetski@gmx.de (Guennadi Liakhovetski) Date: Mon, 18 Mar 2013 12:58:49 +0100 (CET) Subject: [PATCH 43/43] ARM: shmobile: fix kzm9g-reference compile breakage In-Reply-To: <1363607255-6385-44-git-send-email-horms+renesas@verge.net.au> References: <1363607255-6385-1-git-send-email-horms+renesas@verge.net.au> <1363607255-6385-44-git-send-email-horms+renesas@verge.net.au> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Simon On Mon, 18 Mar 2013, Simon Horman wrote: > From: Guennadi Liakhovetski > > 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 > Signed-off-by: Simon Horman 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/