diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-11-17 22:03:26 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-11-17 22:03:26 +0100 |
| commit | 3d590056b056ee93de03d951a8077a94be1e14d4 (patch) | |
| tree | 2ee7aac2ee26a3e0481cfb6d510d5e18be9ef065 /drivers/pinctrl/renesas/core.c | |
| parent | 3603a537bf791d4047b89fd0fc060f723eded458 (diff) | |
| parent | d4aac7d439c2d9307cb5137fc285464a36978107 (diff) | |
Merge tag 'renesas-pinctrl-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: renesas: Updates for v5.11
- Add remaining video-in (VIN) pin groups on R-Car H2 and RZ/G1H,
- Image size optimizations and code consolidations,
- Minor fixes and improvements.
Diffstat (limited to 'drivers/pinctrl/renesas/core.c')
| -rw-r--r-- | drivers/pinctrl/renesas/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/renesas/core.c b/drivers/pinctrl/renesas/core.c index c528c124fb0e..2cc457279345 100644 --- a/drivers/pinctrl/renesas/core.c +++ b/drivers/pinctrl/renesas/core.c @@ -315,6 +315,7 @@ int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type) range = NULL; break; +#ifdef CONFIG_PINCTRL_SH_PFC_GPIO case PINMUX_TYPE_OUTPUT: range = &pfc->info->output; break; @@ -322,6 +323,7 @@ int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type) case PINMUX_TYPE_INPUT: range = &pfc->info->input; break; +#endif /* CONFIG_PINCTRL_SH_PFC_GPIO */ default: return -EINVAL; |