Commit 18e471dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:

 - Fix an altmode in the Ocelot driver

 - Fix the IES control pins in the Mediatek MT8365 driver

 - Sunxi (AMLogic) driver:
    - Fix the UART2 function pin assignments
    - Fix the signal name of the PA2 SPI pin

* tag 'pinctrl-v5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: sunxi: f1c100s: Fix signal name comment for PA2 SPI pin
  pinctrl: sunxi: fix f1c100s uart2 function
  pinctrl: mediatek: mt8365: fix IES control pins
  pinctrl: ocelot: Fix for lan966x alt mode
parents d904c8cc e199975b

drivers/pinctrl/mediatek/pinctrl-mt8365.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static const struct mtk_pin_ies_smt_set mt8365_ies_set[] = { 
	MTK_PIN_IES_SMT_SPEC(104, 104, 0x420, 13),

	MTK_PIN_IES_SMT_SPEC(105, 109, 0x420, 14),

	MTK_PIN_IES_SMT_SPEC(110, 113, 0x420, 15),

	MTK_PIN_IES_SMT_SPEC(114, 112, 0x420, 16),

	MTK_PIN_IES_SMT_SPEC(114, 116, 0x420, 16),

	MTK_PIN_IES_SMT_SPEC(117, 119, 0x420, 17),

	MTK_PIN_IES_SMT_SPEC(120, 122, 0x420, 18),

	MTK_PIN_IES_SMT_SPEC(123, 125, 0x420, 19),

drivers/pinctrl/pinctrl-ocelot.c

+3 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ enum { 
	FUNC_PTP1,

	FUNC_PTP2,

	FUNC_PTP3,

	FUNC_PTPSYNC_0,

	FUNC_PTPSYNC_1,

	FUNC_PTPSYNC_2,

	FUNC_PTPSYNC_3,
@@ -252,6 +253,7 @@ static const char *const ocelot_function_names[] = { 
	[FUNC_PTP1]		= "ptp1",

	[FUNC_PTP2]		= "ptp2",

	[FUNC_PTP3]		= "ptp3",

	[FUNC_PTPSYNC_0]	= "ptpsync_0",

	[FUNC_PTPSYNC_1]	= "ptpsync_1",

	[FUNC_PTPSYNC_2]	= "ptpsync_2",

	[FUNC_PTPSYNC_3]	= "ptpsync_3",
@@ -983,7 +985,7 @@ LAN966X_P(31, GPIO, FC3_c, CAN1, NONE, OB_TRG, RECO_b, NON 
LAN966X_P(32,   GPIO,   FC3_c,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,      NONE,        R);

LAN966X_P(33,   GPIO,   FC1_b,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,    MIIM_b,        R);

LAN966X_P(34,   GPIO,   FC1_b,     NONE,   SGPIO_a,     NONE,  MIIM_Sa,    MIIM_b,        R);

LAN966X_P(35,   GPIO,   FC1_b,     NONE,   SGPIO_a,   CAN0_b,     NONE,      NONE,        R);

LAN966X_P(35,   GPIO,   FC1_b,  PTPSYNC_0, SGPIO_a,   CAN0_b,     NONE,      NONE,        R);

LAN966X_P(36,   GPIO,    NONE,  PTPSYNC_1,    NONE,   CAN0_b,     NONE,      NONE,        R);

LAN966X_P(37,   GPIO, FC_SHRD0, PTPSYNC_2, TWI_SLC_GATE_AD, NONE, NONE,      NONE,        R);

LAN966X_P(38,   GPIO,    NONE,  PTPSYNC_3,    NONE,     NONE,     NONE,      NONE,        R);

drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct sunxi_desc_pin suniv_f1c100s_pins[] = { 
		  SUNXI_FUNCTION(0x3, "pwm0"),		/* PWM0 */

		  SUNXI_FUNCTION(0x4, "i2s"),		/* IN */

		  SUNXI_FUNCTION(0x5, "uart1"),		/* RX */

		  SUNXI_FUNCTION(0x6, "spi1")),		/* MOSI */

		  SUNXI_FUNCTION(0x6, "spi1")),		/* CLK */

	SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 3),

		  SUNXI_FUNCTION(0x0, "gpio_in"),

		  SUNXI_FUNCTION(0x1, "gpio_out"),
@@ -204,7 +204,7 @@ static const struct sunxi_desc_pin suniv_f1c100s_pins[] = { 
		  SUNXI_FUNCTION(0x0, "gpio_in"),

		  SUNXI_FUNCTION(0x1, "gpio_out"),

		  SUNXI_FUNCTION(0x2, "lcd"),		/* D20 */

		  SUNXI_FUNCTION(0x3, "lvds1"),		/* RX */

		  SUNXI_FUNCTION(0x3, "uart2"),		/* RX */

		  SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 14)),

	SUNXI_PIN(SUNXI_PINCTRL_PIN(D, 15),

		  SUNXI_FUNCTION(0x0, "gpio_in"),