mirror of https://gitee.com/openkylin/linux.git
pinctrl: sh-pfc: Stop calling gpiochip_add_pin_range() on DT platforms
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:
parent
6ff33f3902
commit
18fab3995e
|
@ -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 (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
|
||||
return 0;
|
||||
|
||||
if (range->start >= pfc->nr_gpio_pins)
|
||||
break;
|
||||
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];
|
||||
|
||||
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 (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. */
|
||||
|
|
Loading…
Reference in New Issue