Skip to contentSkip to conversation

ARM: shmobile: Remove #gpio-ranges-cells property

PATCH New Laurent Pinchart 4 participants 8 messages Sep 11, 2013 – Sep 22, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover ARM: shmobile: Remove #gpio-ranges-cells property

(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(-)
Signature · 3 lines
Regards,

Laurent Pinchart
#1 lore raw

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

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.

---
 drivers/gpio/gpio-rcar.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpio/gpio-rcar.c +3 -4
index e3745eb..6038966 100644
@@ -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;
 	}
Signature · 1 line
1.8.1.5
#2 lore raw

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

Quoted 5 lines · 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.

Simon please take the whole set into the SH tree.

Yours,
Linus Walleij

#3 lore raw

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

Quoted 7 lines · Linus Walleij
Quoted 4 lines · 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.

Quoted 5 lines
Quoted 1 line

Simon please take the whole set into the SH tree.

Thanks, will do.

#4 lore raw

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

Hi Simon,

Quoted 8 lines · On Friday 20 September 2013 12:06:14 Simon Horman wrote:
Quoted 7 lines · Linus Walleij

On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart

Quoted 4 lines · <[email protected]> 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.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Signed-off-by: Laurent Pinchart
<[email protected]>

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 ?

Signature · 3 lines
Regards,

Laurent Pinchart
#5 lore raw

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

Quoted 14 lines · Laurent Pinchart

Hi Simon,

Quoted 11 lines · On Friday 20 September 2013 12:06:14 Simon Horman wrote:
Quoted 10 lines · Linus Walleij

On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart

Quoted 6 lines · <[email protected]> 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
<[email protected]>

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

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.

#6 lore raw

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

Quoted 17 lines · Simon Horman
Quoted 16 lines · Laurent Pinchart

Hi Simon,

Quoted 13 lines · On Friday 20 September 2013 12:06:14 Simon Horman wrote:
Quoted 12 lines · Linus Walleij

On Wed, Sep 11, 2013 at 3:51 PM, Laurent Pinchart

Quoted 6 lines · <[email protected]> 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
<[email protected]>

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

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.

#7 lore raw

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

In reply to Laurent Pinchart

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

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