Message ID | cover.1406766463.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
On Wed, Jul 30, 2014 at 5:33 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > Hi Olof, Hi Kevin, Hi Arnd, > > Please consider these fourth round of Renesas ARM based SoC clock > updates for v3.17. > > I am sending this even though v3.16-rc6 has long since been released > as this pull-request only includes a single one line fix for a problem > introduced in patches you have already queued up for v3.16. > > At it turns out the problem should not manifest at run time > as it is an error in an clock that is not used without DT modifications. > As such I am happy for you to ask me to defer this to v3.18 if you like. > > This pull request is based on the previous round of > such requests, tagged as renesas-clock3-for-v3.17, > which you have already merged. It is less work to just apply a patch when there's a single one like this. Please just send it and ask us to apply it on top of the previous branch. -Olof
On Wed, Jul 30, 2014 at 05:35:51PM -0700, Olof Johansson wrote: > On Wed, Jul 30, 2014 at 5:33 PM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > Hi Olof, Hi Kevin, Hi Arnd, > > > > Please consider these fourth round of Renesas ARM based SoC clock > > updates for v3.17. > > > > I am sending this even though v3.16-rc6 has long since been released > > as this pull-request only includes a single one line fix for a problem > > introduced in patches you have already queued up for v3.16. > > > > At it turns out the problem should not manifest at run time > > as it is an error in an clock that is not used without DT modifications. > > As such I am happy for you to ask me to defer this to v3.18 if you like. > > > > This pull request is based on the previous round of > > such requests, tagged as renesas-clock3-for-v3.17, > > which you have already merged. > > It is less work to just apply a patch when there's a single one like > this. Please just send it and ask us to apply it on top of the > previous branch. Thanks, I wasn't aware of that. The patch was sent as a reply to this email, though you were not CCed on the patch email. I will repost it with you CCed.
Am 31.07.2014 02:42, schrieb Simon Horman: > A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 > clock support for DT"). This patch removes it. > > This change should not have any run-time affect at this time as "effect", in case Olof wants to fix it up. > the clock in question is used by a SCIF device that is not enabled by > default. > > Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Cheers, Andreas
Hi Simon, Olof, On Thu, Jul 31, 2014 at 2:42 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 > clock support for DT"). This patch removes it. > > This change should not have any run-time affect at this time as > the clock in question is used by a SCIF device that is not enabled by > default. > > Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Hi Olof, > > this is a repost of the patch you asked for so you can apply it directly > rather than as pulling a pull request. It seems Olof missed this one. As a consequence, we now have the bad version in v3.17-rc1, and in renesas-devel-20140818-v3.17-rc1. > diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c > index 0d77f65..b0993a5 100644 > --- a/arch/arm/mach-shmobile/clock-sh73a0.c > +++ b/arch/arm/mach-shmobile/clock-sh73a0.c > @@ -644,7 +644,7 @@ static struct clk_lookup lookups[] = { > CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ > CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */ > CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */ > - CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > + CLKDEV_DEV_ID("e6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */ > CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */ > CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */ > -- > 2.0.1 > > -- > 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 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
Hi Geert, thanks for noting that. I will add this back to the devel branch in the renesas tree. Olof, could you pick up the patch below for v3.17-rcX? On Mon, Aug 18, 2014 at 10:32:19AM +0200, Geert Uytterhoeven wrote: > Hi Simon, Olof, > > On Thu, Jul 31, 2014 at 2:42 AM, Simon Horman > <horms+renesas@verge.net.au> wrote: > > A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 > > clock support for DT"). This patch removes it. > > > > This change should not have any run-time affect at this time as > > the clock in question is used by a SCIF device that is not enabled by > > default. > > > > Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Hi Olof, > > > > this is a repost of the patch you asked for so you can apply it directly > > rather than as pulling a pull request. > > It seems Olof missed this one. > As a consequence, we now have the bad version in v3.17-rc1, and in > renesas-devel-20140818-v3.17-rc1. > > > diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c > > index 0d77f65..b0993a5 100644 > > --- a/arch/arm/mach-shmobile/clock-sh73a0.c > > +++ b/arch/arm/mach-shmobile/clock-sh73a0.c > > @@ -644,7 +644,7 @@ static struct clk_lookup lookups[] = { > > CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ > > CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */ > > CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */ > > - CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > > + CLKDEV_DEV_ID("e6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > > CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */ > > CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */ > > CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */ > > -- > > 2.0.1 > > > > -- > > 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 > > 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 >
On Tue, Aug 19, 2014 at 08:56:34AM +0900, Simon Horman wrote: > Hi Geert, thanks for noting that. > > I will add this back to the devel branch in the renesas tree. > > Olof, could you pick up the patch below for v3.17-rcX? Olof, I have two more clock fixes for v3.17. I'll send a pull request for them and the one below once things have sat in next for a bit. > > On Mon, Aug 18, 2014 at 10:32:19AM +0200, Geert Uytterhoeven wrote: > > Hi Simon, Olof, > > > > On Thu, Jul 31, 2014 at 2:42 AM, Simon Horman > > <horms+renesas@verge.net.au> wrote: > > > A stray '0x' crept into a0f7e7496d56ac2d ("ARM: shmobile: sh73a0: add CMT1 > > > clock support for DT"). This patch removes it. > > > > > > This change should not have any run-time affect at this time as > > > the clock in question is used by a SCIF device that is not enabled by > > > default. > > > > > > Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > --- > > > arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > Hi Olof, > > > > > > this is a repost of the patch you asked for so you can apply it directly > > > rather than as pulling a pull request. > > > > It seems Olof missed this one. > > As a consequence, we now have the bad version in v3.17-rc1, and in > > renesas-devel-20140818-v3.17-rc1. > > > > > diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c > > > index 0d77f65..b0993a5 100644 > > > --- a/arch/arm/mach-shmobile/clock-sh73a0.c > > > +++ b/arch/arm/mach-shmobile/clock-sh73a0.c > > > @@ -644,7 +644,7 @@ static struct clk_lookup lookups[] = { > > > CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ > > > CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */ > > > CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */ > > > - CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > > > + CLKDEV_DEV_ID("e6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */ > > > CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */ > > > CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */ > > > CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */ > > > -- > > > 2.0.1 > > > > > > -- > > > 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 > > > > 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 >