Commit 141415d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pin control fixes from Linus Walleij:

 - Fix some documentation warnings for Allwinner

 - Fix duplicated GPIO groups on Qualcomm SDX55

 - Fix a double enablement bug in the Ralink driver

 - Fix the Qualcomm SC8180x Kconfig so the driver can be selected.

* tag 'pinctrl-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: qcom: Make it possible to select SC8180x TLMM
  pinctrl: ralink: rt2880: avoid to error in calls is pin is already enabled
  pinctrl: qcom: Fix duplication in gpio_groups
  pinctrl: aspeed: Fix minor documentation error
parents efc1fd60 30e9857a

drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c

+2 −2
Original line number Diff line number Diff line
@@ -2702,8 +2702,8 @@ static int aspeed_g5_sig_expr_eval(struct aspeed_pinmux_data *ctx, 
}



/**

 * Configure a pin's signal by applying an expression's descriptor state for

 * all descriptors in the expression.

 * aspeed_g5_sig_expr_set() - Configure a pin's signal by applying an

 * expression's descriptor state for all descriptors in the expression.

 *

 * @ctx: The pinmux context

 * @expr: The expression associated with the function whose signal is to be

drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c

+2 −2
Original line number Diff line number Diff line
@@ -2611,8 +2611,8 @@ static struct aspeed_pin_config aspeed_g6_configs[] = { 
};



/**

 * Configure a pin's signal by applying an expression's descriptor state for

 * all descriptors in the expression.

 * aspeed_g6_sig_expr_set() - Configure a pin's signal by applying an

 * expression's descriptor state for all descriptors in the expression.

 *

 * @ctx: The pinmux context

 * @expr: The expression associated with the function whose signal is to be

drivers/pinctrl/aspeed/pinctrl-aspeed.c

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static int aspeed_sig_expr_disable(struct aspeed_pinmux_data *ctx, 
}



/**

 * Disable a signal on a pin by disabling all provided signal expressions.

 * aspeed_disable_sig() - Disable a signal on a pin by disabling all provided

 * signal expressions.

 *

 * @ctx: The pinmux context

 * @exprs: The list of signal expressions (from a priority level on a pin)

drivers/pinctrl/aspeed/pinmux-aspeed.c

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ static inline void aspeed_sig_desc_print_val( 
}



/**

 * Query the enabled or disabled state of a signal descriptor

 * aspeed_sig_desc_eval() - Query the enabled or disabled state of a signal

 * descriptor.

 *

 * @desc: The signal descriptor of interest

 * @enabled: True to query the enabled state, false to query disabled state

drivers/pinctrl/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ config PINCTRL_SC7280 
config PINCTRL_SC8180X

	tristate "Qualcomm Technologies Inc SC8180x pin controller driver"

	depends on GPIOLIB && (OF || ACPI)

	select PINCTRL_MSM

	depends on PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm Technologies Inc TLMM block found on the Qualcomm