[PATCH/RESEND 0/2] ARM: shmobile: Remove #gpio-ranges-cells property

[PATCH/RESEND 0/2] ARM: shmobile: Remove #gpio-ranges-cells property

[Laurent Pinchart]

(Resending due to wrong copy&paste in mailing list e-mail addresses, sorry for
the noise.)

The property has been deprecated and unused since commit
d9fe0039c4247383c2783923a3860227813b4d82 ("gpio: implement gpio-ranges binding
document fix"). Remove it.

This is a v3.12 fix, based on top of the latest mainline master branch.
Regression and backward compatibility issue should not occur, as:

- The first patch hardcodes the number of gpio-range cells to 3, which was the
  value used by all boards so far.

- The second patch removes a property from .dtsi files that isn't used anymore
  since the above-mentioned commit.

However, care must be taken to merge the patches in the correct order. Linus,
Simon, would you like to two patches to go through a single tree, or should
Linus provide a stable branch ?

Laurent Pinchart (2):
  gpio: rcar: Remove #gpio-range-cells DT property usage
  ARM: shmobile: Remove #gpio-ranges-cells DT property

 arch/arm/boot/dts/r8a7778.dtsi | 1 -
 arch/arm/boot/dts/r8a7779.dtsi | 1 -
 arch/arm/boot/dts/r8a7790.dtsi | 1 -
 drivers/gpio/gpio-rcar.c       | 7 +++----
 4 files changed, 3 insertions(+), 7 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Laurent Pinchart]

Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
gpio-ranges documentation") deprecated the #gpio-range-cells property.
Replace its usage with a hardcoded value in the gpio-rcar driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpio/gpio-rcar.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index e3745eb..6038966 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -293,10 +293,9 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
 	if (pdata) {
 		p->config = *pdata;
 	} else if (IS_ENABLED(CONFIG_OF) && np) {
-		ret = of_parse_phandle_with_args(np, "gpio-ranges",
-				"#gpio-range-cells", 0, &args);
-		p->config.number_of_pins = ret == 0 && args.args_count == 3
-					 ? args.args[2]
+		ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0,
+						       &args);
+		p->config.number_of_pins = ret == 0 ? args.args[2]
 					 : RCAR_MAX_GPIO_PER_BANK;
 		p->config.gpio_base = -1;
 	}
-- 
1.8.1.5

Re: [PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Linus Walleij]

On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:

> Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
> gpio-ranges documentation") deprecated the #gpio-range-cells property.
> Replace its usage with a hardcoded value in the gpio-rcar driver.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Simon please take the whole set into the SH tree.

Yours,
Linus Walleij

Re: [PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Simon Horman]

On Fri, Sep 20, 2013 at 08:36:57PM +0200, Linus Walleij wrote:
> On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com> wrote:
> 
> > Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
> > gpio-ranges documentation") deprecated the #gpio-range-cells property.
> > Replace its usage with a hardcoded value in the gpio-rcar driver.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Simon please take the whole set into the SH tree.

Thanks, will do.

Re: [PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Laurent Pinchart]

Hi Simon,

On Friday 20 September 2013 12:06:14 Simon Horman wrote:
> On Fri, Sep 20, 2013 at 08:36:57PM +0200, Linus Walleij wrote:
> > On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart
> > 
> > <laurent.pinchart+renesas@ideasonboard.com> wrote:
> > > Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
> > > gpio-ranges documentation") deprecated the #gpio-range-cells property.
> > > Replace its usage with a hardcoded value in the gpio-rcar driver.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > 
> > Simon please take the whole set into the SH tree.
> 
> Thanks, will do.

Just a quick reminder that the two patches are v3.12 fixes. Would you like me 
to send you a pull request ?

-- 
Regards,

Laurent Pinchart

Re: [PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Simon Horman]

On Fri, Sep 20, 2013 at 09:57:44PM +0200, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 20 September 2013 12:06:14 Simon Horman wrote:
> > On Fri, Sep 20, 2013 at 08:36:57PM +0200, Linus Walleij wrote:
> > > On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart
> > > 
> > > <laurent.pinchart+renesas@ideasonboard.com> wrote:
> > > > Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
> > > > gpio-ranges documentation") deprecated the #gpio-range-cells property.
> > > > Replace its usage with a hardcoded value in the gpio-rcar driver.
> > > > 
> > > > Signed-off-by: Laurent Pinchart
> > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > 
> > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > 
> > > Simon please take the whole set into the SH tree.
> > 
> > Thanks, will do.
> 
> Just a quick reminder that the two patches are v3.12 fixes. Would you like me 
> to send you a pull request ?

Thanks, that would be very helpful.

Re: [PATCH/RESEND 1/2] gpio: rcar: Remove #gpio-range-cells DT property usage

[Simon Horman]

On Sun, Sep 22, 2013 at 09:04:48PM +0900, Simon Horman wrote:
> On Fri, Sep 20, 2013 at 09:57:44PM +0200, Laurent Pinchart wrote:
> > Hi Simon,
> > 
> > On Friday 20 September 2013 12:06:14 Simon Horman wrote:
> > > On Fri, Sep 20, 2013 at 08:36:57PM +0200, Linus Walleij wrote:
> > > > On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart
> > > > 
> > > > <laurent.pinchart+renesas@ideasonboard.com> wrote:
> > > > > Commit a1bc260bb5f5d95da854be7898202d788e94448d ("gpio: clean up
> > > > > gpio-ranges documentation") deprecated the #gpio-range-cells property.
> > > > > Replace its usage with a hardcoded value in the gpio-rcar driver.
> > > > > 
> > > > > Signed-off-by: Laurent Pinchart
> > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > 
> > > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > 
> > > > Simon please take the whole set into the SH tree.
> > > 
> > > Thanks, will do.
> > 
> > Just a quick reminder that the two patches are v3.12 fixes. Would you like me 
> > to send you a pull request ?
> 
> Thanks, that would be very helpful.

Actually, scratch that.
I have the patches and I will queue them up.

[PATCH/RESEND 2/2] ARM: shmobile: Remove #gpio-ranges-cells DT property

[Laurent Pinchart]

This property is no longer required by the GPIO binding. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7778.dtsi | 1 -
 arch/arm/boot/dts/r8a7779.dtsi | 1 -
 arch/arm/boot/dts/r8a7790.dtsi | 1 -
 3 files changed, 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 45ac404..3577aba 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -96,6 +96,5 @@
 	pfc: pfc@fffc0000 {
 		compatible = "renesas,pfc-r8a7778";
 		reg = <0xfffc000 0x118>;
-		#gpio-range-cells = <3>;
 	};
 };
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 23a6244..ebbe507 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -188,7 +188,6 @@
 	pfc: pfc@fffc0000 {
 		compatible = "renesas,pfc-r8a7779";
 		reg = <0xfffc0000 0x23c>;
-		#gpio-range-cells = <3>;
 	};
 
 	thermal@ffc48000 {
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 3b879e7..9851398 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -148,7 +148,6 @@
 	pfc: pfc@e6060000 {
 		compatible = "renesas,pfc-r8a7790";
 		reg = <0 0xe6060000 0 0x250>;
-		#gpio-range-cells = <3>;
 	};
 
 	sdhi0: sdhi@ee100000 {
-- 
1.8.1.5