linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Linus Walleij <linus.walleij@linaro.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Simon Horman <horms@verge.net.au>,
	Magnus Damm <magnus.damm@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	Benoit Parrot <bparrot@ti.com>,
	linux-gpio@vger.kernel.org, linux-sh@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 4/7] pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms
Date: Tue, 30 Jun 2015 09:45:24 +0200	[thread overview]
Message-ID: <1435650327-2542-5-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1435650327-2542-1-git-send-email-geert+renesas@glider.be>

On platforms where the PFC/GPIO controller is instantiated from DT, the
mapping between GPIOs and pins is set up using the "gpio-ranges"
property in DT.

Hence stop setting up the mapping from C code on DT platforms.
This code is still used for SH or ARM-legacy platforms.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/sh-pfc/gpio.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index ba353735ecf2be9a..1be118e4865fd3f8 100644
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -379,22 +379,26 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 
 	pfc->gpio = chip;
 
-	/* Register the GPIO to pin mappings. As pins with GPIO ports must come
-	 * first in the ranges, skip the pins without GPIO ports by stopping at
-	 * the first range that contains such a pin.
-	 */
-	for (i = 0; i < pfc->nr_ranges; ++i) {
-		const struct sh_pfc_pin_range *range = &pfc->ranges[i];
-
-		if (range->start >= pfc->nr_gpio_pins)
-			break;
-
-		ret = gpiochip_add_pin_range(&chip->gpio_chip,
-					     dev_name(pfc->dev),
-					     range->start, range->start,
-					     range->end - range->start + 1);
-		if (ret < 0)
-			return ret;
+	if (IS_ENABLED(CONFIG_SUPERH) ||
+	    IS_ENABLED(CONFIG_ARCH_SHMOBILE_LEGACY)) {
+		/*
+		 * Register the GPIO to pin mappings. As pins with GPIO ports
+		 * must come first in the ranges, skip the pins without GPIO
+		 * ports by stopping at the first range that contains such a
+		 * pin.
+		 */
+		for (i = 0; i < pfc->nr_ranges; ++i) {
+			const struct sh_pfc_pin_range *range = &pfc->ranges[i];
+
+			if (range->start >= pfc->nr_gpio_pins)
+				break;
+
+			ret = gpiochip_add_pin_range(&chip->gpio_chip,
+				dev_name(pfc->dev), range->start, range->start,
+				range->end - range->start + 1);
+			if (ret < 0)
+				return ret;
+		}
 	}
 
 	/* Register the function GPIOs chip. */
-- 
1.9.1


  parent reply	other threads:[~2015-06-30  7:45 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-30  7:45 [PATCH 0/7] ARM: shmobile: Move gpio ranges from C code to DT Geert Uytterhoeven
2015-06-30  7:45 ` [PATCH 1/7] ARM: shmobile: r8a73a4 dtsi: Add missing "gpio-ranges" to gpio node Geert Uytterhoeven
2015-06-30  9:49   ` Laurent Pinchart
2015-07-14 12:05     ` Geert Uytterhoeven
2015-07-16  9:42       ` Linus Walleij
2015-06-30  7:45 ` [PATCH 2/7] ARM: shmobile: r8a7740 " Geert Uytterhoeven
2015-06-30  9:41   ` Laurent Pinchart
2015-06-30  7:45 ` [PATCH 3/7] ARM: shmobile: sh73a0 " Geert Uytterhoeven
2015-06-30  9:48   ` Laurent Pinchart
2015-06-30  7:45 ` Geert Uytterhoeven [this message]
2015-06-30  9:30   ` [PATCH 4/7] pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms Laurent Pinchart
2015-06-30  9:44     ` Geert Uytterhoeven
2015-06-30  9:54       ` Laurent Pinchart
2015-06-30  7:45 ` [PATCH 5/7] pinctrl: sh-pfc: Remove empty gpio_function_free() Geert Uytterhoeven
2015-06-30  9:34   ` Laurent Pinchart
2015-06-30  7:45 ` [PATCH 6/7] pinctrl: sh-pfc: Move sh_pfc_add_gpiochip() up Geert Uytterhoeven
2015-06-30  9:35   ` Laurent Pinchart
2015-06-30  7:45 ` [PATCH 7/7] pinctrl: sh-pfc: Confine legacy function GPIOs to SH Geert Uytterhoeven
2015-06-30  9:38   ` Laurent Pinchart
2015-06-30  9:48     ` Geert Uytterhoeven
2015-07-16  9:00 ` [PATCH 0/7] ARM: shmobile: Move gpio ranges from C code to DT Linus Walleij
2015-07-16  9:06   ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435650327-2542-5-git-send-email-geert+renesas@glider.be \
    --to=geert+renesas@glider.be \
    --cc=boris.brezillon@free-electrons.com \
    --cc=bparrot@ti.com \
    --cc=gnurou@gmail.com \
    --cc=horms@verge.net.au \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=maxime.ripard@free-electrons.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).