diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-05-09 00:37:04 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-05-09 00:37:04 +0200 |
| commit | 7740dda5b465b67df7cbe3c4c2b96c10e874b09f (patch) | |
| tree | 7308e66d59d4142691dca40b3a00508e674b4579 | |
| parent | 32c8a94660e8f00fb81849de8f109951118532aa (diff) | |
| parent | 41fe32ecc7aff4527a4ee477870d9b1164be95a4 (diff) | |
Merge tag 'sh-pfc-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: sh-pfc: Updates for v5.8
- Fix SWIO pins on RZ/A1L,
- Add missing bindings to MAINTAINERS.
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-rza1.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e64e5db31497..edeb025d9187 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13346,6 +13346,7 @@ M: Geert Uytterhoeven <geert+renesas@glider.be> L: linux-renesas-soc@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc +F: Documentation/devicetree/bindings/pinctrl/renesas,* F: drivers/pinctrl/pinctrl-rz* F: drivers/pinctrl/sh-pfc/ diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c index da2d8365c690..ff4a7fb518bb 100644 --- a/drivers/pinctrl/pinctrl-rza1.c +++ b/drivers/pinctrl/pinctrl-rza1.c @@ -418,7 +418,7 @@ static const struct rza1_bidir_entry rza1l_bidir_entries[RZA1_NPORTS] = { }; static const struct rza1_swio_entry rza1l_swio_entries[] = { - [0] = { ARRAY_SIZE(rza1h_swio_pins), rza1h_swio_pins }, + [0] = { ARRAY_SIZE(rza1l_swio_pins), rza1l_swio_pins }, }; /* RZ/A1L (r7s72102x) pinmux flags table */ |