From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH 4/7] pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms Date: Tue, 30 Jun 2015 12:30:55 +0300 Message-ID: <3655225.qDiVN00LS0@avalon> References: <1435650327-2542-1-git-send-email-geert+renesas@glider.be> <1435650327-2542-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]:50593 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbbF3Jaw (ORCPT ); Tue, 30 Jun 2015 05:30:52 -0400 In-Reply-To: <1435650327-2542-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: Linus Walleij , Alexandre Courbot , Simon Horman , Magnus Damm , 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 30 June 2015 09:45:24 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 > --- > 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)) { I'd prefer checking IS_ENABLED(CONFIG_OF) && pfc->dev->of_node as that doesn't explicitly depend on the platform type. As the code after this if block also don't need to run on non-DT platforms, how about just using if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node) return 0; ? > + /* > + * 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