* [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
@ 2013-05-15 10:46 Guennadi Liakhovetski
2013-05-15 11:00 ` Laurent Pinchart
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Guennadi Liakhovetski @ 2013-05-15 10:46 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>
---
v2: fix a fixed bit-count, thanks to Laurent for catching
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..a2f83ae 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, 2,
+ 1, 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 v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 10:46 [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
@ 2013-05-15 11:00 ` Laurent Pinchart
2013-05-20 7:36 ` Linus Walleij
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2013-05-15 11:00 UTC (permalink / raw)
To: linux-sh
On Wednesday 15 May 2013 12:46:49 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>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>
> v2: fix a fixed bit-count, thanks to Laurent for catching
>
> 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..a2f83ae 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, 2,
> + 1, 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,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 10:46 [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 11:00 ` Laurent Pinchart
@ 2013-05-20 7:36 ` Linus Walleij
2013-05-20 11:15 ` Laurent Pinchart
2013-05-23 1:39 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2013-05-20 7:36 UTC (permalink / raw)
To: linux-sh
On Wed, May 15, 2013 at 12:46 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> 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>
> ---
>
> v2: fix a fixed bit-count, thanks to Laurent for catching
Acked-by: Linus Walleij <linus.walleij@linaro.org>
I was a bit confused first and tried to apply this for v3.10 fixes,
but it appears this is for the v3.11 stuff queued in Simon's tree
right?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 10:46 [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 11:00 ` Laurent Pinchart
2013-05-20 7:36 ` Linus Walleij
@ 2013-05-20 11:15 ` Laurent Pinchart
2013-05-23 1:39 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2013-05-20 11:15 UTC (permalink / raw)
To: linux-sh
Hi Linus,
On Monday 20 May 2013 09:36:59 Linus Walleij wrote:
> On Wed, May 15, 2013 at 12:46 PM, 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>
> > ---
> >
> > v2: fix a fixed bit-count, thanks to Laurent for catching
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I was a bit confused first and tried to apply this for v3.10 fixes, but it
> appears this is for the v3.11 stuff queued in Simon's tree right?
That's correct. We will still need one kernel version to stabilize the sh-pfc
driver with DT support. After that it should be easier to push the patches
through your tree.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables
2013-05-15 10:46 [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
` (2 preceding siblings ...)
2013-05-20 11:15 ` Laurent Pinchart
@ 2013-05-23 1:39 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-05-23 1:39 UTC (permalink / raw)
To: linux-sh
On Mon, May 20, 2013 at 01:15:54PM +0200, Laurent Pinchart wrote:
> Hi Linus,
>
> On Monday 20 May 2013 09:36:59 Linus Walleij wrote:
> > On Wed, May 15, 2013 at 12:46 PM, 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>
> > > ---
> > >
> > > v2: fix a fixed bit-count, thanks to Laurent for catching
> >
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >
> > I was a bit confused first and tried to apply this for v3.10 fixes, but it
> > appears this is for the v3.11 stuff queued in Simon's tree right?
>
> That's correct. We will still need one kernel version to stabilize the sh-pfc
> driver with DT support. After that it should be easier to push the patches
> through your tree.
Thanks, queued up for v3.11 in the pinmux branch of the renesas tree.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-23 1:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-15 10:46 [PATCH v2 1/2] pinctrl: sh-pfc: fix r8a7790 Function Select register tables Guennadi Liakhovetski
2013-05-15 11:00 ` Laurent Pinchart
2013-05-20 7:36 ` Linus Walleij
2013-05-20 11:15 ` Laurent Pinchart
2013-05-23 1:39 ` 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).