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

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

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

drivers/pinctrl/sh-pfc/gpio.c

+19 −22
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
	struct sh_pfc_chip *chip;

	phys_addr_t address;

	unsigned int i;

	int ret;



	if (pfc->info->data_regs == NULL)

		return 0;
@@ -379,8 +378,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
	if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)

		return 0;



	if (IS_ENABLED(CONFIG_SUPERH) ||

	    IS_ENABLED(CONFIG_ARCH_SHMOBILE_LEGACY)) {

#ifdef CONFIG_SUPERH

	/*

	 * Register the GPIO to pin mappings. As pins with GPIO ports

	 * must come first in the ranges, skip the pins without GPIO
@@ -389,6 +387,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
	 */

	for (i = 0; i < pfc->nr_ranges; ++i) {

		const struct sh_pfc_pin_range *range = &pfc->ranges[i];

		int ret;



		if (range->start >= pfc->nr_gpio_pins)

			break;
@@ -399,9 +398,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) 
		if (ret < 0)

			return ret;

	}

	}



#ifdef CONFIG_SUPERH

	/* Register the function GPIOs chip. */

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

		return 0;