redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms

Browse source 
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>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Geert Uytterhoeven 2015-08-04 15:55:17 +02:00
parent 6ff33f3902
commit 18fab3995e
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/pinctrl/sh-pfc/gpio.c
View file

@ -379,22 +379,29 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
pfc->gpio = chip; pfc->gpio = chip;
/* Register the GPIO to pin mappings. As pins with GPIO ports must come if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
* first in the ranges, skip the pins without GPIO ports by stopping at return 0;
* 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) if (IS_ENABLED(CONFIG_SUPERH) ||
break; 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];
ret = gpiochip_add_pin_range(&chip->gpio_chip, if (range->start >= pfc->nr_gpio_pins)
dev_name(pfc->dev), break;
range->start, range->start,
range->end - range->start + 1); ret = gpiochip_add_pin_range(&chip->gpio_chip,
if (ret < 0) dev_name(pfc->dev), range->start, range->start,
return ret; range->end - range->start + 1);
if (ret < 0)
return ret;
}
} }
/* Register the function GPIOs chip. */ /* Register the function GPIOs chip. */