linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
@ 2012-11-22 16:28 Phil Edworthy
  2012-11-22 17:48 ` Laurent Pinchart
  2012-12-18  2:36 ` Simon Horman
  0 siblings, 2 replies; 8+ messages in thread
From: Phil Edworthy @ 2012-11-22 16:28 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-11-22 16:28 [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry Phil Edworthy
@ 2012-11-22 17:48 ` Laurent Pinchart
  2012-12-18  2:36 ` Simon Horman
  1 sibling, 0 replies; 8+ messages in thread
From: Laurent Pinchart @ 2012-11-22 17:48 UTC (permalink / raw)
  To: linux-arm-kernel

On Thursday 22 November 2012 16:28:57 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>

Simon, this will conflict with my PFC patch series. As I'm still waiting for 
review and need to send a v2 anyway, please apply this patch to your tree and 
push it for v3.8 if time permits. I'll rebase my series on top of it.

> ---
>  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] */
-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-11-22 16:28 [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry Phil Edworthy
  2012-11-22 17:48 ` Laurent Pinchart
@ 2012-12-18  2:36 ` Simon Horman
  2012-12-18  3:51   ` Simon Horman
  1 sibling, 1 reply; 8+ messages in thread
From: Simon Horman @ 2012-12-18  2:36 UTC (permalink / raw)
  To: linux-arm-kernel

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.

> 
> 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
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-12-18  2:36 ` Simon Horman
@ 2012-12-18  3:51   ` Simon Horman
  2012-12-18  4:28     ` Simon Horman
  0 siblings, 1 reply; 8+ messages in thread
From: Simon Horman @ 2012-12-18  3:51 UTC (permalink / raw)
  To: linux-arm-kernel

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
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-12-18  3:51   ` Simon Horman
@ 2012-12-18  4:28     ` Simon Horman
  2012-12-18  6:50       ` Laurent Pinchart
  2012-12-18  9:58       ` phil.edworthy
  0 siblings, 2 replies; 8+ messages in thread
From: Simon Horman @ 2012-12-18  4:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Dec 18, 2012 at 12:51:44PM +0900, Simon Horman wrote:
> 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?

Sorry, yet another thing.

Phil, could you explain what problems manifest at for users without this
change? To be included in stable it is important that it solves a problem
that actually manifests.

> > > 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
> > 
> --
> 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
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-12-18  4:28     ` Simon Horman
@ 2012-12-18  6:50       ` Laurent Pinchart
  2012-12-18  9:58       ` phil.edworthy
  1 sibling, 0 replies; 8+ messages in thread
From: Laurent Pinchart @ 2012-12-18  6:50 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Tuesday 18 December 2012 13:28:54 Simon Horman wrote:
> On Tue, Dec 18, 2012 at 12:51:44PM +0900, Simon Horman wrote:
> > 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?

Sure. I've added the patch to my tree.

> Sorry, yet another thing.
> 
> Phil, could you explain what problems manifest at for users without this
> change? To be included in stable it is important that it solves a problem
> that actually manifests.
> 
> > > > 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] */

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-12-18  4:28     ` Simon Horman
  2012-12-18  6:50       ` Laurent Pinchart
@ 2012-12-18  9:58       ` phil.edworthy
  2012-12-19  1:49         ` Simon Horman
  1 sibling, 1 reply; 8+ messages in thread
From: phil.edworthy @ 2012-12-18  9:58 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

> On Tue, Dec 18, 2012 at 12:51:44PM +0900, Simon Horman wrote:
> > 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?
> 
> Sorry, yet another thing.
> 
> Phil, could you explain what problems manifest at for users without this
> change? To be included in stable it is important that it solves a 
problem
> that actually manifests.

If the user requests certain pin functionality (e.g. any HSPI2_B pins such 
as GPIO_FN_HSPI_CLK2_B), the MOD_SEL2 register won't be set up correctly, 
so it won't work. I am not sure if that warrants going onto stable or not 
- your call!

Thanks
Phil

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry
  2012-12-18  9:58       ` phil.edworthy
@ 2012-12-19  1:49         ` Simon Horman
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2012-12-19  1:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Dec 18, 2012 at 09:58:35AM +0000, phil.edworthy@renesas.com wrote:
> Hi Simon,
> 
> > On Tue, Dec 18, 2012 at 12:51:44PM +0900, Simon Horman wrote:
> > > 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?
> > 
> > Sorry, yet another thing.
> > 
> > Phil, could you explain what problems manifest at for users without this
> > change? To be included in stable it is important that it solves a 
> problem
> > that actually manifests.
> 
> If the user requests certain pin functionality (e.g. any HSPI2_B pins such 
> as GPIO_FN_HSPI_CLK2_B), the MOD_SEL2 register won't be set up correctly, 
> so it won't work. I am not sure if that warrants going onto stable or not 
> - your call!

Thanks. At this stage I think that it isn't stable material.
Regardless, I will see about getting the fix included in 3.8.

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-12-19  1:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-22 16:28 [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry Phil Edworthy
2012-11-22 17:48 ` Laurent Pinchart
2012-12-18  2:36 ` Simon Horman
2012-12-18  3:51   ` Simon Horman
2012-12-18  4:28     ` Simon Horman
2012-12-18  6:50       ` Laurent Pinchart
2012-12-18  9:58       ` phil.edworthy
2012-12-19  1:49         ` Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).