Commit 56f891b4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

pinctrl: sh-pfc: Confine legacy function GPIOs to SH

Legacy function GPIOs are no longer used on ARM since commit
a27c5cd1 ("sh-pfc: sh73a0: Remove function GPIOs").
Extract its setup code into a separate function, and make all function
GPIO related code and data depend on CONFIG_SUPERH.
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 57106e5c
...@@ -46,7 +46,9 @@ struct sh_pfc { ...@@ -46,7 +46,9 @@ struct sh_pfc {
unsigned int nr_gpio_pins; unsigned int nr_gpio_pins;
struct sh_pfc_chip *gpio; struct sh_pfc_chip *gpio;
#ifdef CONFIG_SUPERH
struct sh_pfc_chip *func; struct sh_pfc_chip *func;
#endif
struct sh_pfc_pinctrl *pinctrl; struct sh_pfc_pinctrl *pinctrl;
}; };
......
...@@ -261,6 +261,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip) ...@@ -261,6 +261,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
* Function GPIOs * Function GPIOs
*/ */
#ifdef CONFIG_SUPERH
static int gpio_function_request(struct gpio_chip *gc, unsigned offset) static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
{ {
static bool __print_once; static bool __print_once;
...@@ -300,6 +301,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip) ...@@ -300,6 +301,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip)
return 0; return 0;
} }
#endif
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Register/unregister * Register/unregister
...@@ -399,6 +401,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) ...@@ -399,6 +401,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
} }
} }
#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;
...@@ -408,6 +411,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) ...@@ -408,6 +411,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
return PTR_ERR(chip); return PTR_ERR(chip);
pfc->func = chip; pfc->func = chip;
#endif /* CONFIG_SUPERH */
return 0; return 0;
} }
...@@ -415,7 +419,8 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc) ...@@ -415,7 +419,8 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc) int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc)
{ {
gpiochip_remove(&pfc->gpio->gpio_chip); gpiochip_remove(&pfc->gpio->gpio_chip);
#ifdef CONFIG_SUPERH
gpiochip_remove(&pfc->func->gpio_chip); gpiochip_remove(&pfc->func->gpio_chip);
#endif
return 0; return 0;
} }
...@@ -143,8 +143,10 @@ struct sh_pfc_soc_info { ...@@ -143,8 +143,10 @@ struct sh_pfc_soc_info {
const struct sh_pfc_function *functions; const struct sh_pfc_function *functions;
unsigned int nr_functions; unsigned int nr_functions;
#ifdef CONFIG_SUPERH
const struct pinmux_func *func_gpios; const struct pinmux_func *func_gpios;
unsigned int nr_func_gpios; unsigned int nr_func_gpios;
#endif
const struct pinmux_cfg_reg *cfg_regs; const struct pinmux_cfg_reg *cfg_regs;
const struct pinmux_data_reg *data_regs; const struct pinmux_data_reg *data_regs;
......
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