Commit 44896cd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents f902a778 78de41a3

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -10928,6 +10928,17 @@ L: linux-gpio@vger.kernel.org 
S:	Supported

F:	drivers/pinctrl/pinctrl-at91-pio4.*



PIN CONTROLLER - FREESCALE

M:	Dong Aisheng <aisheng.dong@nxp.com>

M:	Fabio Estevam <festevam@gmail.com>

M:	Shawn Guo <shawnguo@kernel.org>

M:	Stefan Agner <stefan@agner.ch>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

L:	linux-gpio@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/freescale/

F:	Documentation/devicetree/bindings/pinctrl/fsl,*



PIN CONTROLLER - INTEL

M:	Mika Westerberg <mika.westerberg@linux.intel.com>

M:	Heikki Krogerus <heikki.krogerus@linux.intel.com>

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

+2 −2
Original line number Diff line number Diff line
@@ -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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE