UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pin control fixes for v4.16: 

- Fix a pin group on the Meson.
 - Assign maintainers for Freescale/NXP pin controllers.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJal7MkAAoJEEEQszewGV1zfW8QAJbeMR/FZCmufgSaeHi1HuTQ
 Q6naMUT+23zaBjFwHarXjvlH2YxGqGDRu22fQxn44Ruxh4utCG9dkp800Si3Rzit
 FmIiKBBRw/MnjDmmWMq+SkpaAzseCXg97us6beFk9ZoO+/t/JrZenuVgk/XQtrv9
 7Fy98OvU0nXr366Jn2ZI8q4g57XpRbGX+2x/DIs68B7wOLBQpVl/OId4n+foyVmR
 VxRzGS9f6fnXK4BxSUGPzdcCdbRDLZIYxuLXJoAzQDAAEbby7/qKyPHeIsZYWBBW
 Jsn1lun/tcPVFFhYR6Fo5w/45UW7+rjfm4MFR3zPtZfEusflMd9byBp7+PPoV1X4
 CQ4TB3yW5+0I/xjZVPgU6UcbnZWTUGeFy8LZ4NIzTb9I8hxGrkoVlHZtft5syFtD
 kZViwRG5a1txWH+9/5yJnLg0KKS3+rh2Knn/GJTV4NdJcj/18Ye4NEueXIcJzYlX
 947aSnBJpMfOX0I6tBg0VW8tb2js2ROHLg5sOMbGAaCyr3KfZkOnCze7lWSV0VmS
 v8K9zBtUjMFPddXG6O4EvwYOax0W5bnFfJ6MmcEnGxCKdEtUShaJNRiyPzGYei0O
 s/znLxQmhV4IAKt6AQ/bLlKeNpvoeC7THBBjhjKhn5j+QNhBqtUVvVrUh/tv2DEQ
 t0XrzQMKSYcbfiPKQMI9
 =jVcD
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-03-01 08:19:10 -08:00
parent f902a778df 78de41a368
commit 44896cd1de
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MAINTAINERS
View File

@ -10928,6 +10928,17 @@ L: linux-gpio@vger.kernel.org
S: Supported S: Supported
F: drivers/pinctrl/pinctrl-at91-pio4.* 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 PIN CONTROLLER - INTEL
M: Mika Westerberg <mika.westerberg@linux.intel.com> M: Mika Westerberg <mika.westerberg@linux.intel.com>
M: Heikki Krogerus <heikki.krogerus@linux.intel.com> M: Heikki Krogerus <heikki.krogerus@linux.intel.com>

4
drivers/pinctrl/meson/pinctrl-meson-axg.c
View File

@ -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", "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_tx_b_z", "uart_ao_rx_b_z",
"uart_ao_cts_b_z", "uart_ao_rts_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(nand),
FUNCTION(uart_a), FUNCTION(uart_a),
FUNCTION(uart_b), FUNCTION(uart_b),
FUNCTION(uart_ao_b_gpioz), FUNCTION(uart_ao_b_z),
FUNCTION(i2c0), FUNCTION(i2c0),
FUNCTION(i2c1), FUNCTION(i2c1),
FUNCTION(i2c2), FUNCTION(i2c2),