* [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
@ 2013-05-15 9:07 Guennadi Liakhovetski
2013-05-15 9:53 ` Laurent Pinchart
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-15 9:07 UTC (permalink / raw)
To: linux-sh
Fix several errors in Peripheral Function Select register tables for
r8a7790, which prevent various function pins from being correctly
configured.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---
drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index 5be2999..39a9083 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -3175,7 +3175,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }
},
{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,
- 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {
+ 2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {
/* IP11_31_30 [2] */
FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,
/* IP11_29_27 [3] */
@@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
FN_SEL_SOF0_0, FN_SEL_SOF0_1, }
},
{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,
- 2, 1, 1, 1, 1, 2, 1, 2, 1,
- 2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {
- /* RESEVED [2] */
+ 3, 1, 1, 1, 2, 1, 2, 1,
+ 3, 1, 1, 3, 3, 2, 3, 2, 2) {
+ /* RESEVED [3] */
0, 0, 0, 0, 0, 0, 0, 0,
- /* RESEVED [1] */
- 0, 0,
/* SEL_TMU1 [1] */
FN_SEL_TMU1_0, FN_SEL_TMU1_1,
/* SEL_HSCIF1 [1] */
@@ -3462,8 +3460,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
/* SEL_CAN1 [1] */
FN_SEL_CAN1_0, FN_SEL_CAN1_1,
/* RESEVED [2] */
- 0, 0, 0, 0, 0, 0, 0, 0,
- /* RESEVED [1] */
+ 0, 0, 0, 0,
+ /* RESEVED [1] (actually TX2, RX2 vs. TX2_B, RX2_B of SCIF2) */
0, 0,
/* SEL_ADI [1] */
FN_SEL_ADI_0, FN_SEL_ADI_1,
--
1.7.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 9:07 [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
@ 2013-05-15 9:53 ` Laurent Pinchart
2013-05-15 10:00 ` Guennadi Liakhovetski
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2013-05-15 9:53 UTC (permalink / raw)
To: linux-sh
Hi Guennadi,
Thank you for the patch.
On Wednesday 15 May 2013 11:07:21 Guennadi Liakhovetski wrote:
> Fix several errors in Peripheral Function Select register tables for
> r8a7790, which prevent various function pins from being correctly
> configured.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> ---
> drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 14 ++++++--------
> 1 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 5be2999..39a9083 100644
> --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> @@ -3175,7 +3175,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }
> },
> { PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,
> - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {
> + 2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {
> /* IP11_31_30 [2] */
> FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,
> /* IP11_29_27 [3] */
> @@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg pinmux_config_regs[] > { FN_SEL_SOF0_0, FN_SEL_SOF0_1, }
> },
> { PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,
> - 2, 1, 1, 1, 1, 2, 1, 2, 1,
> - 2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> - /* RESEVED [2] */
> + 3, 1, 1, 1, 2, 1, 2, 1,
> + 3, 1, 1, 3, 3, 2, 3, 2, 2) {
Shouldn't it be
+ 3, 1, 1, 1, 2, 1, 2, 1, 2,
+ 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> + /* RESEVED [3] */
While you're at it, what about RESERVED ? :-)
> 0, 0, 0, 0, 0, 0, 0, 0,
> - /* RESEVED [1] */
> - 0, 0,
> /* SEL_TMU1 [1] */
> FN_SEL_TMU1_0, FN_SEL_TMU1_1,
> /* SEL_HSCIF1 [1] */
> @@ -3462,8 +3460,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> /* SEL_CAN1 [1] */
> FN_SEL_CAN1_0, FN_SEL_CAN1_1,
> /* RESEVED [2] */
> - 0, 0, 0, 0, 0, 0, 0, 0,
> - /* RESEVED [1] */
> + 0, 0, 0, 0,
> + /* RESEVED [1] (actually TX2, RX2 vs. TX2_B, RX2_B of SCIF2) */
Would you like to submit a patch to add SCIF2 support, or should I do it ?
> 0, 0,
> /* SEL_ADI [1] */
> FN_SEL_ADI_0, FN_SEL_ADI_1,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 9:07 [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 9:53 ` Laurent Pinchart
@ 2013-05-15 10:00 ` Guennadi Liakhovetski
2013-05-15 10:18 ` Laurent Pinchart
2013-05-15 10:37 ` Guennadi Liakhovetski
3 siblings, 0 replies; 5+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-15 10:00 UTC (permalink / raw)
To: linux-sh
Hi Laurent
On Wed, 15 May 2013, Laurent Pinchart wrote:
> Hi Guennadi,
>
> Thank you for the patch.
>
> On Wednesday 15 May 2013 11:07:21 Guennadi Liakhovetski wrote:
> > Fix several errors in Peripheral Function Select register tables for
> > r8a7790, which prevent various function pins from being correctly
> > configured.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > ---
> > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 14 ++++++--------
> > 1 files changed, 6 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 5be2999..39a9083 100644
> > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > @@ -3175,7 +3175,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> > FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }
> > },
> > { PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,
> > - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {
> > + 2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {
> > /* IP11_31_30 [2] */
> > FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,
> > /* IP11_29_27 [3] */
> > @@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg pinmux_config_regs[] > > { FN_SEL_SOF0_0, FN_SEL_SOF0_1, }
> > },
> > { PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,
> > - 2, 1, 1, 1, 1, 2, 1, 2, 1,
> > - 2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> > - /* RESEVED [2] */
> > + 3, 1, 1, 1, 2, 1, 2, 1,
> > + 3, 1, 1, 3, 3, 2, 3, 2, 2) {
>
> Shouldn't it be
>
> + 3, 1, 1, 1, 2, 1, 2, 1, 2,
> + 1, 1, 1, 3, 3, 2, 3, 2, 2) {
2 + 1 = 3 :) As long as SCIF2 isn't supported it's not too important.
>
> > + /* RESEVED [3] */
>
> While you're at it, what about RESERVED ? :-)
Ah, that must be a separate patch! :-D
> > 0, 0, 0, 0, 0, 0, 0, 0,
> > - /* RESEVED [1] */
> > - 0, 0,
> > /* SEL_TMU1 [1] */
> > FN_SEL_TMU1_0, FN_SEL_TMU1_1,
> > /* SEL_HSCIF1 [1] */
> > @@ -3462,8 +3460,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
> > /* SEL_CAN1 [1] */
> > FN_SEL_CAN1_0, FN_SEL_CAN1_1,
> > /* RESEVED [2] */
> > - 0, 0, 0, 0, 0, 0, 0, 0,
> > - /* RESEVED [1] */
> > + 0, 0, 0, 0,
> > + /* RESEVED [1] (actually TX2, RX2 vs. TX2_B, RX2_B of SCIF2) */
>
> Would you like to submit a patch to add SCIF2 support, or should I do it ?
I won't fight for this honour ;-)
> > 0, 0,
> > /* SEL_ADI [1] */
> > FN_SEL_ADI_0, FN_SEL_ADI_1,
> --
> Regards,
>
> Laurent Pinchart
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 9:07 [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 9:53 ` Laurent Pinchart
2013-05-15 10:00 ` Guennadi Liakhovetski
@ 2013-05-15 10:18 ` Laurent Pinchart
2013-05-15 10:37 ` Guennadi Liakhovetski
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2013-05-15 10:18 UTC (permalink / raw)
To: linux-sh
On Wednesday 15 May 2013 12:00:53 Guennadi Liakhovetski wrote:
> On Wed, 15 May 2013, Laurent Pinchart wrote:
> > On Wednesday 15 May 2013 11:07:21 Guennadi Liakhovetski wrote:
> > > Fix several errors in Peripheral Function Select register tables for
> > > r8a7790, which prevent various function pins from being correctly
> > > configured.
> > >
> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > ---
> > >
> > > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 14 ++++++--------
> > > 1 files changed, 6 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 5be2999..39a9083 100644
> > > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > > @@ -3175,7 +3175,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[]
> > > = {
> > > FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }
> > > },
> > > { PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,
> > > - 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {
> > > + 2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {
> > > /* IP11_31_30 [2] */
> > > FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,
> > > /* IP11_29_27 [3] */
> > > @@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg
> > > pinmux_config_regs[] > > > { FN_SEL_SOF0_0, FN_SEL_SOF0_1, }
> > > },
> > > { PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,
> > > - 2, 1, 1, 1, 1, 2, 1, 2, 1,
> > > - 2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> > > - /* RESEVED [2] */
> > > + 3, 1, 1, 1, 2, 1, 2, 1,
> > > + 3, 1, 1, 3, 3, 2, 3, 2, 2) {
> >
> > Shouldn't it be
> >
> > + 3, 1, 1, 1, 2, 1, 2, 1, 2,
> > + 1, 1, 1, 3, 3, 2, 3, 2, 2) {
>
> 2 + 1 = 3 :) As long as SCIF2 isn't supported it's not too important.
But 2^2 + 2^1 != 2^3
> > > + /* RESEVED [3] */
> >
> > While you're at it, what about RESERVED ? :-)
>
> Ah, that must be a separate patch! :-D
>
> > > 0, 0, 0, 0, 0, 0, 0, 0,
> > > - /* RESEVED [1] */
> > > - 0, 0,
> > > /* SEL_TMU1 [1] */
> > > FN_SEL_TMU1_0, FN_SEL_TMU1_1,
> > > /* SEL_HSCIF1 [1] */
> > > @@ -3462,8 +3460,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[]
> > > = {
> > > /* SEL_CAN1 [1] */
> > > FN_SEL_CAN1_0, FN_SEL_CAN1_1,
> > > /* RESEVED [2] */
> > > - 0, 0, 0, 0, 0, 0, 0, 0,
> > > - /* RESEVED [1] */
> > > + 0, 0, 0, 0,
> > > + /* RESEVED [1] (actually TX2, RX2 vs. TX2_B, RX2_B of SCIF2) */
> >
> > Would you like to submit a patch to add SCIF2 support, or should I do it ?
>
> I won't fight for this honour ;-)
>
> > > 0, 0,
> > > /* SEL_ADI [1] */
> > > FN_SEL_ADI_0, FN_SEL_ADI_1,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 9:07 [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
` (2 preceding siblings ...)
2013-05-15 10:18 ` Laurent Pinchart
@ 2013-05-15 10:37 ` Guennadi Liakhovetski
3 siblings, 0 replies; 5+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-15 10:37 UTC (permalink / raw)
To: linux-sh
On Wed, 15 May 2013, Laurent Pinchart wrote:
> On Wednesday 15 May 2013 12:00:53 Guennadi Liakhovetski wrote:
> > On Wed, 15 May 2013, Laurent Pinchart wrote:
> > > On Wednesday 15 May 2013 11:07:21 Guennadi Liakhovetski wrote:
> > > > Fix several errors in Peripheral Function Select register tables for
> > > > r8a7790, which prevent various function pins from being correctly
> > > > configured.
> > > >
> > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > > ---
> > > >
> > > > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 14 ++++++--------
> > > > 1 files changed, 6 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > > > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 5be2999..39a9083 100644
> > > > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
> > > > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
[snip]
> > > > @@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg
> > > > pinmux_config_regs[] > > > > { FN_SEL_SOF0_0, FN_SEL_SOF0_1, }
> > > > },
> > > > { PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,
> > > > - 2, 1, 1, 1, 1, 2, 1, 2, 1,
> > > > - 2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> > > > - /* RESEVED [2] */
> > > > + 3, 1, 1, 1, 2, 1, 2, 1,
> > > > + 3, 1, 1, 3, 3, 2, 3, 2, 2) {
> > >
> > > Shouldn't it be
> > >
> > > + 3, 1, 1, 1, 2, 1, 2, 1, 2,
> > > + 1, 1, 1, 3, 3, 2, 3, 2, 2) {
> >
> > 2 + 1 = 3 :) As long as SCIF2 isn't supported it's not too important.
>
> But 2^2 + 2^1 != 2^3
Argh, overzealous patching :-( I'll update.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-15 10:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-15 9:07 [PATCH] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 9:53 ` Laurent Pinchart
2013-05-15 10:00 ` Guennadi Liakhovetski
2013-05-15 10:18 ` Laurent Pinchart
2013-05-15 10:37 ` Guennadi Liakhovetski
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.