Merge tag 'pinctrl-v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

333a396d · Linus Torvalds <[email protected]> · 2023-06-09 09:02:56 -07:00

Pull pin control fix from Linus Walleij:
 "A single fix for the Meson driver, nothing else has surfaced so far
  this cycle"

* tag 'pinctrl-v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: meson-axg: add missing GPIOA_18 gpio group

Commit: 333a396d71ce4083da31ccbf30772bf2da1509b4
Parents: 697fa9b5 · 5b10ff01

Merge commit. Changes below are compared with the first parent: 697fa9b5.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/pinctrl/meson/pinctrl-meson-axg.c	modified	+1	−0	View file

drivers/pinctrl/meson/pinctrl-meson-axg.c

View file

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 7bfecdf..d249a03 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -400,6 +400,7 @@ static struct meson_pmx_group meson_axg_periphs_groups[] = {
 	GPIO_GROUP(GPIOA_15),
 	GPIO_GROUP(GPIOA_16),
 	GPIO_GROUP(GPIOA_17),
+	GPIO_GROUP(GPIOA_18),
 	GPIO_GROUP(GPIOA_19),
 	GPIO_GROUP(GPIOA_20),
 