Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18fab399 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 6ff33f39

drivers/pinctrl/sh-pfc/gpio.c

+22 −15
Original line number Diff line number Diff line
@@ -379,9 +379,16 @@ 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.

	if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)

		return 0;



	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];
@@ -390,12 +397,12 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
				break;



			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);

			if (ret < 0)

				return ret;

		}

	}



	/* Register the function GPIOs chip. */

	if (pfc->info->nr_func_gpios == 0)