projects/linux·commit 44896cd1

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

44896cd1 · Linus Torvalds <[email protected]> · 2018-03-01 08:19:10 -08:00

Pull pin control fixes from Linus Walleij:
 "Two smallish pin control fixes: one actual code fix for the Meson and
  a MAINTAINERS update.

  Summary:

   - fix a pin group on the Meson

   - assign maintainers for Freescale/NXP pin controllers"

* tag 'pinctrl-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  MAINTAINERS: add Freescale pin controllers
  pinctrl: meson-axg: adjust uart_ao_b pin group naming
Commit
44896cd1deeb40a6926f1394c8d506ec99ea53c8
Parents
f902a778 · 78de41a3

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

Changes

2 files changed · +13 −2

FileStatusAddDelContent
MAINTAINERSmodified+11−0View file
drivers/pinctrl/meson/pinctrl-meson-axg.cmodified+2−2View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 8249251..1c95c60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10928,6 +10928,17 @@ L: [email protected]
S: Supported
F: drivers/pinctrl/pinctrl-at91-pio4.*
+PIN CONTROLLER - FREESCALE
+M: Dong Aisheng <[email protected]>
+M: Fabio Estevam <[email protected]>
+M: Shawn Guo <[email protected]>
+M: Stefan Agner <[email protected]>
+R: Pengutronix Kernel Team <[email protected]>
+L: [email protected]
+S: Maintained
+F: drivers/pinctrl/freescale/
+F: Documentation/devicetree/bindings/pinctrl/fsl,*
+
PIN CONTROLLER - INTEL
M: Mika Westerberg <[email protected]>
M: Heikki Krogerus <[email protected]>

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 1fda9d6..4b91ff7 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -716,7 +716,7 @@ static const char * const uart_b_groups[] = {
"uart_tx_b_x", "uart_rx_b_x", "uart_cts_b_x", "uart_rts_b_x",
};
-static const char * const uart_ao_b_gpioz_groups[] = {
+static const char * const uart_ao_b_z_groups[] = {
"uart_ao_tx_b_z", "uart_ao_rx_b_z",
"uart_ao_cts_b_z", "uart_ao_rts_b_z",
};
@@ -855,7 +855,7 @@ static struct meson_pmx_func meson_axg_periphs_functions[] = {
FUNCTION(nand),
FUNCTION(uart_a),
FUNCTION(uart_b),
- FUNCTION(uart_ao_b_gpioz),
+ FUNCTION(uart_ao_b_z),
FUNCTION(i2c0),
FUNCTION(i2c1),
FUNCTION(i2c2),