diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-02-13 10:42:12 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-13 10:42:12 +0100 |
| commit | 44df22e7ce156499350a723ab3186d45911f00cd (patch) | |
| tree | 233bc94cfb963a0a16a533efd50cac052f9779bb /drivers/pinctrl/sh-pfc/pfc-emev2.c | |
| parent | pinctrl: sunxi: Support I/O bias voltage setting on A80 (diff) | |
| parent | pinctrl: sh-pfc: r8a77965: Add DRIF pins, groups and functions (diff) | |
| download | linux-44df22e7ce156499350a723ab3186d45911f00cd.tar.xz linux-44df22e7ce156499350a723ab3186d45911f00cd.zip | |
Merge tag 'sh-pfc-for-v5.1-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: sh-pfc: Updates for v5.1 (take two)
- Add DRIF (digital radio) pin groups on R-Car E3 and M3-N,
- Add TMU (timer) pin groups on R-Car M3-N,
- Miscellaneous fixes,
- Build-time validation for fixed-size field width mismatches.
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-emev2.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-emev2.c b/drivers/pinctrl/sh-pfc/pfc-emev2.c index dc271c3243df..310c6f3ee7cc 100644 --- a/drivers/pinctrl/sh-pfc/pfc-emev2.c +++ b/drivers/pinctrl/sh-pfc/pfc-emev2.c @@ -1260,6 +1260,14 @@ static const char * const dtv_groups[] = { "dtv_b", }; +static const char * const err_rst_reqb_groups[] = { + "err_rst_reqb", +}; + +static const char * const ext_clki_groups[] = { + "ext_clki", +}; + static const char * const iic0_groups[] = { "iic0", }; @@ -1282,6 +1290,10 @@ static const char * const lcd_groups[] = { "yuv3", }; +static const char * const lowpwr_groups[] = { + "lowpwr", +}; + static const char * const ntsc_groups[] = { "ntsc_clk", "ntsc_data", @@ -1295,6 +1307,10 @@ static const char * const pwm1_groups[] = { "pwm1", }; +static const char * const ref_clko_groups[] = { + "ref_clko", +}; + static const char * const sd_groups[] = { "sd_cki", }; @@ -1388,13 +1404,17 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(cam), SH_PFC_FUNCTION(cf), SH_PFC_FUNCTION(dtv), + SH_PFC_FUNCTION(err_rst_reqb), + SH_PFC_FUNCTION(ext_clki), SH_PFC_FUNCTION(iic0), SH_PFC_FUNCTION(iic1), SH_PFC_FUNCTION(jtag), SH_PFC_FUNCTION(lcd), + SH_PFC_FUNCTION(lowpwr), SH_PFC_FUNCTION(ntsc), SH_PFC_FUNCTION(pwm0), SH_PFC_FUNCTION(pwm1), + SH_PFC_FUNCTION(ref_clko), SH_PFC_FUNCTION(sd), SH_PFC_FUNCTION(sdi0), SH_PFC_FUNCTION(sdi1), |