Commit 90d06613 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

pinctrl: sh-pfc: Get rid of CONFIG_ARCH_SHMOBILE_LEGACY

Shmobile is all multiplatform these days, so get rid of the reference to
CONFIG_ARCH_SHMOBILE_LEGACY.

Move the legacy code to do the non-DT mapping between GPIOs and pins
inside the existing #ifdef CONFIG_SUPERH section.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9e214614
...@@ -341,7 +341,6 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) ...@@ -341,7 +341,6 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
struct sh_pfc_chip *chip; struct sh_pfc_chip *chip;
phys_addr_t address; phys_addr_t address;
unsigned int i; unsigned int i;
int ret;
if (pfc->info->data_regs == NULL) if (pfc->info->data_regs == NULL)
return 0; return 0;
...@@ -379,29 +378,27 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) ...@@ -379,29 +378,27 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node) if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
return 0; return 0;
if (IS_ENABLED(CONFIG_SUPERH) || #ifdef CONFIG_SUPERH
IS_ENABLED(CONFIG_ARCH_SHMOBILE_LEGACY)) { /*
/* * Register the GPIO to pin mappings. As pins with GPIO ports
* Register the GPIO to pin mappings. As pins with GPIO ports * must come first in the ranges, skip the pins without GPIO
* must come first in the ranges, skip the pins without GPIO * ports by stopping at the first range that contains such a
* ports by stopping at the first range that contains such a * pin.
* pin. */
*/ for (i = 0; i < pfc->nr_ranges; ++i) {
for (i = 0; i < pfc->nr_ranges; ++i) { const struct sh_pfc_pin_range *range = &pfc->ranges[i];
const struct sh_pfc_pin_range *range = &pfc->ranges[i]; int ret;
if (range->start >= pfc->nr_gpio_pins) if (range->start >= pfc->nr_gpio_pins)
break; break;
ret = gpiochip_add_pin_range(&chip->gpio_chip, ret = gpiochip_add_pin_range(&chip->gpio_chip,
dev_name(pfc->dev), range->start, range->start, dev_name(pfc->dev), range->start, range->start,
range->end - range->start + 1); range->end - range->start + 1);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
} }
#ifdef CONFIG_SUPERH
/* Register the function GPIOs chip. */ /* Register the function GPIOs chip. */
if (pfc->info->nr_func_gpios == 0) if (pfc->info->nr_func_gpios == 0)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment