From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v2 4/6] pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms Date: Thu, 01 Oct 2015 19:04:51 +0300 Message-ID: <1907000.EBhLlX2sDO@avalon> References: <1438696519-13727-1-git-send-email-geert+renesas@glider.be> <1438696519-13727-5-git-send-email-geert+renesas@glider.be> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:44388 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751194AbbJAQEq (ORCPT ); Thu, 1 Oct 2015 12:04:46 -0400 In-Reply-To: <1438696519-13727-5-git-send-email-geert+renesas@glider.be> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Geert Uytterhoeven Cc: Simon Horman , Magnus Damm , Linus Walleij , Alexandre Courbot , Maxime Ripard , Boris Brezillon , Benoit Parrot , linux-gpio@vger.kernel.org, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Hi Geert, Thank you for the patch. On Tuesday 04 August 2015 15:55:17 Geert Uytterhoeven wrote: > 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 > Acked-by: Linus Walleij Acked-by: Laurent Pinchart > --- > v2: > - Add Acked-by, > - Add check for CONFIG_OF and pfc->dev->of_node. > --- > drivers/pinctrl/sh-pfc/gpio.c | 37 ++++++++++++++++++++++--------------- > 1 file changed, 22 insertions(+), 15 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c > index ba353735ecf2be9a..b380e3f17b121bbb 100644 > --- a/drivers/pinctrl/sh-pfc/gpio.c > +++ b/drivers/pinctrl/sh-pfc/gpio.c > @@ -379,22 +379,29 @@ 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; > + if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node) > + return 0; > > - 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. */ -- Regards, Laurent Pinchart