From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
Date: Tue, 18 Dec 2012 03:51:44 +0000 [thread overview]
Message-ID: <20121218035144.GC13353@verge.net.au> (raw)
In-Reply-To: <20121218023610.GV28065@verge.net.au>
On Tue, Dec 18, 2012 at 11:36:10AM +0900, Simon Horman wrote:
> On Thu, Nov 22, 2012 at 04:28:57PM +0000, Phil Edworthy wrote:
> > The list of functions selected by the MOD_SEL2 register was missing
> > an entry. This caused all entries after this to modify the MOD_SEL2
> > register incorrectly.
>
> Laurent, can you handle this in your series?
> I believe it removes this file.
Sorry, I missed the fact that this is for stable.
Laurent, can you handle upstream and I'll handle stable?
> > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > ---
> > arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
> > index 9fac32e4..15f6a48 100644
> > --- a/arch/arm/mach-shmobile/pfc-r8a7779.c
> > +++ b/arch/arm/mach-shmobile/pfc-r8a7779.c
> > @@ -2525,7 +2525,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> > /* SEL_SCIF [2] */
> > FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3,
> > /* SEL_CANCLK [2] */
> > - FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2,
> > + FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, 0,
> > /* SEL_CAN0 [1] */
> > FN_SEL_CAN0_0, FN_SEL_CAN0_1,
> > /* SEL_HSCIF1 [1] */
> > --
> > 1.7.5.4
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
> --
> 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
>
WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
Date: Tue, 18 Dec 2012 12:51:44 +0900 [thread overview]
Message-ID: <20121218035144.GC13353@verge.net.au> (raw)
In-Reply-To: <20121218023610.GV28065@verge.net.au>
On Tue, Dec 18, 2012 at 11:36:10AM +0900, Simon Horman wrote:
> On Thu, Nov 22, 2012 at 04:28:57PM +0000, Phil Edworthy wrote:
> > The list of functions selected by the MOD_SEL2 register was missing
> > an entry. This caused all entries after this to modify the MOD_SEL2
> > register incorrectly.
>
> Laurent, can you handle this in your series?
> I believe it removes this file.
Sorry, I missed the fact that this is for stable.
Laurent, can you handle upstream and I'll handle stable?
> > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > ---
> > arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
> > index 9fac32e4..15f6a48 100644
> > --- a/arch/arm/mach-shmobile/pfc-r8a7779.c
> > +++ b/arch/arm/mach-shmobile/pfc-r8a7779.c
> > @@ -2525,7 +2525,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> > /* SEL_SCIF [2] */
> > FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3,
> > /* SEL_CANCLK [2] */
> > - FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2,
> > + FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, 0,
> > /* SEL_CAN0 [1] */
> > FN_SEL_CAN0_0, FN_SEL_CAN0_1,
> > /* SEL_HSCIF1 [1] */
> > --
> > 1.7.5.4
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2012-12-18 3:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 16:28 [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry Phil Edworthy
2012-11-22 16:28 ` Phil Edworthy
2012-11-22 17:48 ` Laurent Pinchart
2012-11-22 17:48 ` Laurent Pinchart
2012-12-18 2:36 ` Simon Horman
2012-12-18 2:36 ` Simon Horman
2012-12-18 3:51 ` Simon Horman [this message]
2012-12-18 3:51 ` Simon Horman
2012-12-18 4:28 ` Simon Horman
2012-12-18 4:28 ` Simon Horman
2012-12-18 6:50 ` Laurent Pinchart
2012-12-18 6:50 ` Laurent Pinchart
2012-12-18 9:58 ` phil.edworthy
2012-12-18 9:58 ` phil.edworthy at renesas.com
2012-12-19 1:49 ` Simon Horman
2012-12-19 1:49 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121218035144.GC13353@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.