diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-12-21 16:24:59 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-12-21 16:24:59 +0300 |
| commit | 642fb53d350b3ff6a8c85062fcab271d61a56b75 (patch) | |
| tree | 2a67ce24d81aa19e55d124daee2879ec2f48e668 /drivers/pinctrl/sh-pfc/pfc-r8a7740.c | |
| parent | da801ab56ad874897b0b255216767c983e665a4c (diff) | |
| parent | f83f97684a737f66c9a10437544c92e3436ca4e0 (diff) | |
| download | linux-642fb53d350b3ff6a8c85062fcab271d61a56b75.tar.xz | |
Merge tag 'sh-pfc-for-v4.21-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: sh-pfc: Fixes for v4.21
- Miscellaneous fixes,
- Build-time validation for pins/marks mismatches.
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-r8a7740.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index d4f81491996d..6d761e62c6c8 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -1969,7 +1969,7 @@ static const unsigned int gether_gmii_pins[] = { */ 185, 186, 187, 188, 189, 190, 191, 192, 174, 161, 204, 171, 170, 169, 168, 167, 166, 173, 172, 176, 184, 183, 203, - 205, 163, 206, 207, + 205, 163, 206, 207, 158, }; static const unsigned int gether_gmii_mux[] = { ET_ERXD0_MARK, ET_ERXD1_MARK, ET_ERXD2_MARK, ET_ERXD3_MARK, @@ -2141,6 +2141,7 @@ static const unsigned int lcd0_data24_1_mux[] = { LCD0_D0_MARK, LCD0_D1_MARK, LCD0_D2_MARK, LCD0_D3_MARK, LCD0_D4_MARK, LCD0_D5_MARK, LCD0_D6_MARK, LCD0_D7_MARK, LCD0_D8_MARK, LCD0_D9_MARK, LCD0_D10_MARK, LCD0_D11_MARK, + LCD0_D12_MARK, LCD0_D13_MARK, LCD0_D14_MARK, LCD0_D15_MARK, LCD0_D16_MARK, LCD0_D17_MARK, LCD0_D18_PORT163_MARK, LCD0_D19_PORT162_MARK, LCD0_D20_PORT161_MARK, LCD0_D21_PORT158_MARK, LCD0_D22_PORT160_MARK, LCD0_D23_PORT159_MARK, |