[PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Guennadi Liakhovetski]

Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
definition on sh73a0.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

I think it's better to add this one to the fixes too.

 drivers/pinctrl/sh-pfc/pfc-sh73a0.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
index b048fa4..9bcb81f 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
@@ -25,11 +25,7 @@
 #include "sh_pfc.h"
 
 #define CPU_ALL_PORT(fn, pfx, sfx)				\
-	PORT_10(fn, pfx,    sfx), PORT_10(fn, pfx##1, sfx),	\
-	PORT_10(fn, pfx##2, sfx), PORT_10(fn, pfx##3, sfx),	\
-	PORT_10(fn, pfx##4, sfx), PORT_10(fn, pfx##5, sfx),	\
-	PORT_10(fn, pfx##6, sfx), PORT_10(fn, pfx##7, sfx),	\
-	PORT_10(fn, pfx##8, sfx), PORT_10(fn, pfx##9, sfx),	\
+	PORT_10(fn, pfx,    sfx), PORT_90(fn, pfx, sfx),	\
 	PORT_10(fn, pfx##10, sfx),				\
 	PORT_1(fn, pfx##110, sfx), PORT_1(fn, pfx##111, sfx),	\
 	PORT_1(fn, pfx##112, sfx), PORT_1(fn, pfx##113, sfx),	\
@@ -1502,7 +1498,7 @@ static pinmux_enum_t pinmux_data[] = {
 	PINMUX_DATA(SDHID0_2_PU_MARK, PORT254_FN1, PORT254_IN_PU),
 	PINMUX_DATA(SDHID0_3_PU_MARK, PORT255_FN1, PORT255_IN_PU),
 	PINMUX_DATA(SDHICMD0_PU_MARK, PORT256_FN1, PORT256_IN_PU),
-	PINMUX_DATA(SDHIWP0_PU_MARK,  PORT257_FN1, PORT256_IN_PU),
+	PINMUX_DATA(SDHIWP0_PU_MARK,  PORT257_FN1, PORT257_IN_PU),
 	PINMUX_DATA(SDHID1_0_PU_MARK, PORT259_FN1, PORT259_IN_PU),
 	PINMUX_DATA(SDHID1_1_PU_MARK, PORT260_FN1, PORT260_IN_PU),
 	PINMUX_DATA(SDHID1_2_PU_MARK, PORT261_FN1, PORT261_IN_PU),
-- 
1.7.2.5

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Simon Horman]

[CC Linus and Laurent]

On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> definition on sh73a0.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

This patch appears to be against code that has been merged into arm-soc
for 3.9.

In particular the following change in the pfc branch of the renesas tree
a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.

commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date:   Sat Dec 15 23:51:24 2012 +0100

    sh-pfc: Add sh73a0 pinmux support
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

As such, I would like to handle it separately from the other two patches
in this series which are against un-merged code.

Before I do so I would like to:

* Know about the severity of this problem.
  Does it break things?

* Know what the author of the code, Laurent (CCed) thinks about this.

* Know what the pin control maintainer, Linus (CCed) thinks about this.

  Linus, I'm happy to handle this as its code that went through
  my tree. Or I'm happy for you to take it. In the case of the former
  an ack or otherwise would be appreciated.

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Guennadi Liakhovetski]

Hi Simon

On Wed, 13 Feb 2013, Simon Horman wrote:

> [CC Linus and Laurent]
> 
> On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > definition on sh73a0.
> > 
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> 
> This patch appears to be against code that has been merged into arm-soc
> for 3.9.
> 
> In particular the following change in the pfc branch of the renesas tree
> a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> 
> commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Date:   Sat Dec 15 23:51:24 2012 +0100
> 
>     sh-pfc: Add sh73a0 pinmux support
>     
>     Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>     Acked-by: Paul Mundt <lethal@linux-sh.org>
>     Acked-by: Linus Walleij <linus.walleij@linaro.org>
>     Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> As such, I would like to handle it separately from the other two patches
> in this series which are against un-merged code.
> 
> Before I do so I would like to:
> 
> * Know about the severity of this problem.
>   Does it break things?

Yes, .dts doesn't compile without the semicolon.

> * Know what the author of the code, Laurent (CCed) thinks about this.

I thinik, you're the author. The semicolon disappears as a result of your 
merge, AFAICS both original conflicting patches were ok. However, I might 
easily have misinterpreted the merge history.

Thanks
Guennadi

> * Know what the pin control maintainer, Linus (CCed) thinks about this.
> 
>   Linus, I'm happy to handle this as its code that went through
>   my tree. Or I'm happy for you to take it. In the case of the former
>   an ack or otherwise would be appreciated.

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Guennadi Liakhovetski]

On Wed, 13 Feb 2013, Guennadi Liakhovetski wrote:

> Hi Simon
> 
> On Wed, 13 Feb 2013, Simon Horman wrote:
> 
> > [CC Linus and Laurent]
> > 
> > On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > > definition on sh73a0.
> > > 
> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > 
> > This patch appears to be against code that has been merged into arm-soc
> > for 3.9.
> > 
> > In particular the following change in the pfc branch of the renesas tree
> > a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> > 
> > commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > Date:   Sat Dec 15 23:51:24 2012 +0100
> > 
> >     sh-pfc: Add sh73a0 pinmux support
> >     
> >     Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> >     Acked-by: Paul Mundt <lethal@linux-sh.org>
> >     Acked-by: Linus Walleij <linus.walleij@linaro.org>
> >     Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > As such, I would like to handle it separately from the other two patches
> > in this series which are against un-merged code.
> > 
> > Before I do so I would like to:
> > 
> > * Know about the severity of this problem.
> >   Does it break things?
> 
> Yes, .dts doesn't compile without the semicolon.

Ok, sorry, obviously, I was thinking about a different patch. Please, 
ignore this.

As for breakage - so far I'm personally unaware of any breakage, which is 
of course not to say, that none is possible.

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Simon Horman]

On Wed, Feb 13, 2013 at 08:02:56AM +0100, Guennadi Liakhovetski wrote:
> On Wed, 13 Feb 2013, Guennadi Liakhovetski wrote:
> 
> > Hi Simon
> > 
> > On Wed, 13 Feb 2013, Simon Horman wrote:
> > 
> > > [CC Linus and Laurent]
> > > 
> > > On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > > > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > > > definition on sh73a0.
> > > > 
> > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > 
> > > This patch appears to be against code that has been merged into arm-soc
> > > for 3.9.
> > > 
> > > In particular the following change in the pfc branch of the renesas tree
> > > a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> > > 
> > > commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> > > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > > Date:   Sat Dec 15 23:51:24 2012 +0100
> > > 
> > >     sh-pfc: Add sh73a0 pinmux support
> > >     
> > >     Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > >     Acked-by: Paul Mundt <lethal@linux-sh.org>
> > >     Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > >     Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > > 
> > > As such, I would like to handle it separately from the other two patches
> > > in this series which are against un-merged code.
> > > 
> > > Before I do so I would like to:
> > > 
> > > * Know about the severity of this problem.
> > >   Does it break things?
> > 
> > Yes, .dts doesn't compile without the semicolon.
> 
> Ok, sorry, obviously, I was thinking about a different patch. Please, 
> ignore this.
> 
> As for breakage - so far I'm personally unaware of any breakage, which is 
> of course not to say, that none is possible.

Thanks. In any case it is probably appropriate for v3.10.
In any case I'll wait to see what Laurent and Linus have to say.

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Laurent Pinchart]

Hi Simon,

On Wednesday 13 February 2013 17:53:34 Simon Horman wrote:
> On Wed, Feb 13, 2013 at 08:02:56AM +0100, Guennadi Liakhovetski wrote:
> > On Wed, 13 Feb 2013, Guennadi Liakhovetski wrote:
> > > On Wed, 13 Feb 2013, Simon Horman wrote:
> > > > On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > > > > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > > > > definition on sh73a0.
> > > > > 
> > > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > > 
> > > > This patch appears to be against code that has been merged into
> > > > arm-soc for 3.9.
> > > > 
> > > > In particular the following change in the pfc branch of the renesas
> > > > tree a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> > > > 
> > > > commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> > > > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > > > Date:   Sat Dec 15 23:51:24 2012 +0100
> > > > 
> > > >     sh-pfc: Add sh73a0 pinmux support
> > > >     
> > > >     Signed-off-by: Laurent Pinchart
> > > >     <laurent.pinchart+renesas@ideasonboard.com>
> > > >     Acked-by: Paul Mundt <lethal@linux-sh.org>
> > > >     Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > >     Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > > > 
> > > > As such, I would like to handle it separately from the other two
> > > > patches in this series which are against un-merged code.
> > > > 
> > > > Before I do so I would like to:
> > > > 
> > > > * Know about the severity of this problem.
> > > > 
> > > >   Does it break things?
> > > 
> > > Yes, .dts doesn't compile without the semicolon.
> > 
> > Ok, sorry, obviously, I was thinking about a different patch. Please,
> > ignore this.
> > 
> > As for breakage - so far I'm personally unaware of any breakage, which is
> > of course not to say, that none is possible.
> 
> Thanks. In any case it is probably appropriate for v3.10.
> In any case I'll wait to see what Laurent and Linus have to say.

Patches 1/2 should be squashed into the merge that introduced the issue (I 
think that's what you've done already) and 2/2 should be carried along with 
your other kzm9g-reference pinctrl patches for now.

I've taken patch 3/2 in my tree. Given the the SDHIWP0_PU function GPIO isn't 
used in mainline I don't think there's a need to fast-track it to v3.9, I will 
include it in my next pinctrl series for v3.10.

-- 
Regards,

Laurent Pinchart

Re: [PATCH 3/2] pinctrl: sh-pfc: fix a typo and simplify a definition on sh73a0

[Simon Horman]

On Wed, Feb 13, 2013 at 06:48:24PM +0100, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Wednesday 13 February 2013 17:53:34 Simon Horman wrote:
> > On Wed, Feb 13, 2013 at 08:02:56AM +0100, Guennadi Liakhovetski wrote:
> > > On Wed, 13 Feb 2013, Guennadi Liakhovetski wrote:
> > > > On Wed, 13 Feb 2013, Simon Horman wrote:
> > > > > On Tue, Feb 12, 2013 at 04:34:31PM +0100, Guennadi Liakhovetski wrote:
> > > > > > Fix definition of the SDHIWP0 function and simplify the CPU_ALL_PORT
> > > > > > definition on sh73a0.
> > > > > > 
> > > > > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > > > 
> > > > > This patch appears to be against code that has been merged into
> > > > > arm-soc for 3.9.
> > > > > 
> > > > > In particular the following change in the pfc branch of the renesas
> > > > > tree a.k.a the arm-soc/renesas/pinmux branch of the arm-soc tree.
> > > > > 
> > > > > commit 5d5166dc39bcbe2c21d4fca034540133c415dce6
> > > > > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > > > > Date:   Sat Dec 15 23:51:24 2012 +0100
> > > > > 
> > > > >     sh-pfc: Add sh73a0 pinmux support
> > > > >     
> > > > >     Signed-off-by: Laurent Pinchart
> > > > >     <laurent.pinchart+renesas@ideasonboard.com>
> > > > >     Acked-by: Paul Mundt <lethal@linux-sh.org>
> > > > >     Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > >     Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > > > > 
> > > > > As such, I would like to handle it separately from the other two
> > > > > patches in this series which are against un-merged code.
> > > > > 
> > > > > Before I do so I would like to:
> > > > > 
> > > > > * Know about the severity of this problem.
> > > > > 
> > > > >   Does it break things?
> > > > 
> > > > Yes, .dts doesn't compile without the semicolon.
> > > 
> > > Ok, sorry, obviously, I was thinking about a different patch. Please,
> > > ignore this.
> > > 
> > > As for breakage - so far I'm personally unaware of any breakage, which is
> > > of course not to say, that none is possible.
> > 
> > Thanks. In any case it is probably appropriate for v3.10.
> > In any case I'll wait to see what Laurent and Linus have to say.
> 
> Patches 1/2 should be squashed into the merge that introduced the issue (I 
> think that's what you've done already) and 2/2 should be carried along with 
> your other kzm9g-reference pinctrl patches for now.

Yes, that is what I have done.

> I've taken patch 3/2 in my tree. Given the the SDHIWP0_PU function GPIO
> isn't used in mainline I don't think there's a need to fast-track it to
> v3.9, I will include it in my next pinctrl series for v3.10.

Great, thanks.