diff mbox

pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry

Message ID 1369906266-30205-1-git-send-email-phil.edworthy@renesas.com (mailing list archive)
State Superseded
Headers show

Commit Message

Phil Edworthy May 30, 2013, 9:31 a.m. UTC
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.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
---
 drivers/pinctrl/sh-pfc/pfc-r8a7779.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart May 31, 2013, 1:37 a.m. UTC | #1
Hi Phil,

Thank you for the patch.

On Thursday 30 May 2013 10:31:06 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.
> 
> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/pinctrl/sh-pfc/pfc-r8a7779.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 13feaa0..5dfeb3e 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> +++ b/drivers/pinctrl/sh-pfc/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] */
Simon Horman May 31, 2013, 2:43 a.m. UTC | #2
On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> Hi Phil,
> 
> Thank you for the patch.
> 
> On Thursday 30 May 2013 10:31:06 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.
> > 
> > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Thanks Phil, thanks Laurent,

can I clarify that this is targeted at v3.11 and not
necessary for v3.10 or earlier releases.

> 
> > ---
> >  drivers/pinctrl/sh-pfc/pfc-r8a7779.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 13feaa0..5dfeb3e 100644
> > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > +++ b/drivers/pinctrl/sh-pfc/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] */
> -- 
> Regards,
> 
> Laurent Pinchart
> 
--
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
Laurent Pinchart May 31, 2013, 3:03 a.m. UTC | #3
Hi Simon,

On Friday 31 May 2013 11:43:18 Simon Horman wrote:
> On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> > Hi Phil,
> > 
> > Thank you for the patch.
> > 
> > On Thursday 30 May 2013 10:31:06 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.
> > > 
> > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > 
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Thanks Phil, thanks Laurent,
> 
> can I clarify that this is targeted at v3.11 and not necessary for v3.10 or
> earlier releases.

Pushing the patch to v3.10 and v3.9 stable would be nice, as the bug is 
present there as well.

> > > ---
> > > 
> > >  drivers/pinctrl/sh-pfc/pfc-r8a7779.c |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > > b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 13feaa0..5dfeb3e 100644
> > > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
> > > +++ b/drivers/pinctrl/sh-pfc/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] */
Simon Horman May 31, 2013, 5:42 a.m. UTC | #4
On Fri, May 31, 2013 at 05:03:33AM +0200, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 31 May 2013 11:43:18 Simon Horman wrote:
> > On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> > > Hi Phil,
> > > 
> > > Thank you for the patch.
> > > 
> > > On Thursday 30 May 2013 10:31:06 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.
> > > > 
> > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > > 
> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > 
> > Thanks Phil, thanks Laurent,
> > 
> > can I clarify that this is targeted at v3.11 and not necessary for v3.10 or
> > earlier releases.
> 
> Pushing the patch to v3.10 and v3.9 stable would be nice, as the bug is 
> present there as well.

Thanks, I will see about making that so.
--
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
Phil Edworthy May 31, 2013, 8:26 a.m. UTC | #5
Hi Laurent,

> On Friday 31 May 2013 11:43:18 Simon Horman wrote:
> > On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> > > Hi Phil,
> > > 
> > > Thank you for the patch.
> > > 
> > > On Thursday 30 May 2013 10:31:06 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.
> > > > 
> > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > > 
> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > 
> > Thanks Phil, thanks Laurent,
> > 
> > can I clarify that this is targeted at v3.11 and not necessary for 
v3.10 or
> > earlier releases.
> 
> Pushing the patch to v3.10 and v3.9 stable would be nice, as the bug is 
> present there as well.

Not sure if you meant pushing to v3.10, or waiting until a v3.10 stable 
appears. Either would be good...

Thanks
Phil
--
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
Simon Horman May 31, 2013, 11:40 p.m. UTC | #6
On Fri, May 31, 2013 at 09:26:18AM +0100, phil.edworthy@renesas.com wrote:
> Hi Laurent,
> 
> > On Friday 31 May 2013 11:43:18 Simon Horman wrote:
> > > On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> > > > Hi Phil,
> > > > 
> > > > Thank you for the patch.
> > > > 
> > > > On Thursday 30 May 2013 10:31:06 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.
> > > > > 
> > > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > > > 
> > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > 
> > > Thanks Phil, thanks Laurent,
> > > 
> > > can I clarify that this is targeted at v3.11 and not necessary for 
> v3.10 or
> > > earlier releases.
> > 
> > Pushing the patch to v3.10 and v3.9 stable would be nice, as the bug is 
> > present there as well.
> 
> Not sure if you meant pushing to v3.10, or waiting until a v3.10 stable 
> appears. Either would be good...

I am planning to try and getting it included in v3.10.

I think it would help if the changelog was fleshed out a bit.

Could you include some information on what the result of the bug is.
I assume it effects the marzen board (from an upstream kernel point of
view), it would be good to not that too.

Also, could you include something like this in the revised changelog?


This bug has been present since pinmux support was added for the
r8a7779 SoC by  881023d28b465eb457067dc8bbca0f24d8b34279 ("sh-pfc: Add
r8a7779 pinmux support") in v3.8-rc4.
--
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
Phil Edworthy June 3, 2013, 7:46 a.m. UTC | #7
Hi Simon,

> > > On Friday 31 May 2013 11:43:18 Simon Horman wrote:
> > > > On Fri, May 31, 2013 at 03:37:15AM +0200, Laurent Pinchart wrote:
> > > > > Hi Phil,
> > > > > 
> > > > > Thank you for the patch.
> > > > > 
> > > > > On Thursday 30 May 2013 10:31:06 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.
> > > > > > 
> > > > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > > > > 
> > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > 
> > > > Thanks Phil, thanks Laurent,
> > > > 
> > > > can I clarify that this is targeted at v3.11 and not necessary for 

> > v3.10 or
> > > > earlier releases.
> > > 
> > > Pushing the patch to v3.10 and v3.9 stable would be nice, as the bug 
is 
> > > present there as well.
> > 
> > Not sure if you meant pushing to v3.10, or waiting until a v3.10 
stable 
> > appears. Either would be good...
> 
> I am planning to try and getting it included in v3.10.
> 
> I think it would help if the changelog was fleshed out a bit.
> 
> Could you include some information on what the result of the bug is.
> I assume it effects the marzen board (from an upstream kernel point of
> view), it would be good to not that too.

Actually, I've not seen it on the Marzen board, but on another board 
called Hurricane. The bug showed up when selecting i2c2_c pins.
 
> Also, could you include something like this in the revised changelog?
> 
> 
> This bug has been present since pinmux support was added for the
> r8a7779 SoC by  881023d28b465eb457067dc8bbca0f24d8b34279 ("sh-pfc: Add
> r8a7779 pinmux support") in v3.8-rc4.

No problem, I'll send a new patch later today.

Thanks
Phil
--
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
diff mbox

Patch

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
index 13feaa0..5dfeb3e 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
+++ b/drivers/pinctrl/sh-pfc/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] */