| Message ID | 1353601737-21641-1-git-send-email-phil.edworthy@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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] */
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 >
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 >
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 >
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] */
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
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.
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] */
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(-)