Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31558237 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pinctrl fixes from Linus Walleij:
 "Here are some overdue (what can I say, I was on a short vacation)
  driver fixes for the pin control subsystem:

   - Allwinner sun5i A10s had a faulty mapping

   - Freescale i.MX25 had some bad arithmetics

   - Uniphier PH1-sLD8 missed some input enable settings"

* tag 'pinctrl-v4.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: uniphier: fix input enable settings for PH1-sLD8
  pinctrl: imx25: ensure that a pin with id i is at position i in the info array
  pinctrl: sun5i: Fix a10s pwm1 pinctrl mapping
parents 58bd6e06 de7f8e3e

drivers/pinctrl/freescale/pinctrl-imx25.c

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
#include "pinctrl-imx.h"



enum imx25_pads {

	MX25_PAD_RESERVE0 = 1,

	MX25_PAD_RESERVE0 = 0,

	MX25_PAD_RESERVE1 = 1,

	MX25_PAD_A10 = 2,

	MX25_PAD_A13 = 3,

	MX25_PAD_A14 = 4,
@@ -169,6 +170,7 @@ enum imx25_pads { 
/* Pad names for the pinmux subsystem */

static const struct pinctrl_pin_desc imx25_pinctrl_pads[] = {

	IMX_PINCTRL_PIN(MX25_PAD_RESERVE0),

	IMX_PINCTRL_PIN(MX25_PAD_RESERVE1),

	IMX_PINCTRL_PIN(MX25_PAD_A10),

	IMX_PINCTRL_PIN(MX25_PAD_A13),

	IMX_PINCTRL_PIN(MX25_PAD_A14),

drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static const struct sunxi_desc_pin sun5i_a10s_pins[] = { 
		  SUNXI_FUNCTION(0x0, "gpio_in"),

		  SUNXI_FUNCTION(0x1, "gpio_out"),

		  SUNXI_FUNCTION(0x2, "spi1"),		/* CS1 */

		  SUNXI_FUNCTION(0x3, "uart3"),		/* PWM1 */

		  SUNXI_FUNCTION(0x3, "pwm"),		/* PWM1 */

		  SUNXI_FUNCTION(0x5, "uart2"),		/* CTS */

		  SUNXI_FUNCTION_IRQ(0x6, 13)),		/* EINT13 */

};

drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c

+113 −113

File changed.

Preview size limit exceeded, changes collapsed.