diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-03 15:21:26 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-03 15:21:26 +0100 |
| commit | 35cec70720db028bfd18d739fd3df65f21c34590 (patch) | |
| tree | 7fdfc4c2917ec6f72272f850bf1ddff8722c034a /drivers/pinctrl/sh-pfc/pfc-r8a7794.c | |
| parent | pinctrl: mediatek/7623: delete unnecessary .owner (diff) | |
| parent | pinctrl: sh-pfc: r8a7795: Add CAN FD support (diff) | |
| download | linux-35cec70720db028bfd18d739fd3df65f21c34590.tar.xz linux-35cec70720db028bfd18d739fd3df65f21c34590.zip | |
Merge branch 'sh-pfc-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-r8a7794.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c index f2c7bde90219..38912cff597b 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c @@ -4530,6 +4530,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { FN_DU0_DISP, FN_QPOLA, FN_CC50_STATE30, 0, /* IP6_3_2 [2] */ FN_DU0_EXODDF_DU0_ODDF_DISP_CDE, FN_QCPV_QDE, FN_CC50_STATE29, + 0, /* IP6_1_0 [2] */ FN_DU0_EXVSYNC_DU0_VSYNC, FN_QSTB_QHE, FN_CC50_STATE28, 0, } }, |