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

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
...@@ -2702,8 +2702,8 @@ static int aspeed_g5_sig_expr_eval(struct aspeed_pinmux_data *ctx, ...@@ -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 * aspeed_g5_sig_expr_set() - Configure a pin's signal by applying an
* all descriptors in the expression. * expression's descriptor state for all descriptors in the expression.
* *
* @ctx: The pinmux context * @ctx: The pinmux context
* @expr: The expression associated with the function whose signal is to be * @expr: The expression associated with the function whose signal is to be
......
...@@ -2611,8 +2611,8 @@ static struct aspeed_pin_config aspeed_g6_configs[] = { ...@@ -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 * aspeed_g6_sig_expr_set() - Configure a pin's signal by applying an
* all descriptors in the expression. * expression's descriptor state for all descriptors in the expression.
* *
* @ctx: The pinmux context * @ctx: The pinmux context
* @expr: The expression associated with the function whose signal is to be * @expr: The expression associated with the function whose signal is to be
......
...@@ -108,7 +108,8 @@ static int aspeed_sig_expr_disable(struct aspeed_pinmux_data *ctx, ...@@ -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 * @ctx: The pinmux context
* @exprs: The list of signal expressions (from a priority level on a pin) * @exprs: The list of signal expressions (from a priority level on a pin)
......
...@@ -21,7 +21,8 @@ static inline void aspeed_sig_desc_print_val( ...@@ -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 * @desc: The signal descriptor of interest
* @enabled: True to query the enabled state, false to query disabled state * @enabled: True to query the enabled state, false to query disabled state
......
...@@ -223,7 +223,7 @@ config PINCTRL_SC7280 ...@@ -223,7 +223,7 @@ config PINCTRL_SC7280
config PINCTRL_SC8180X config PINCTRL_SC8180X
tristate "Qualcomm Technologies Inc SC8180x pin controller driver" tristate "Qualcomm Technologies Inc SC8180x pin controller driver"
depends on GPIOLIB && (OF || ACPI) depends on GPIOLIB && (OF || ACPI)
select PINCTRL_MSM depends on PINCTRL_MSM
help help
This is the pinctrl, pinmux, pinconf and gpiolib driver for the This is the pinctrl, pinmux, pinconf and gpiolib driver for the
Qualcomm Technologies Inc TLMM block found on the Qualcomm Qualcomm Technologies Inc TLMM block found on the Qualcomm
......
...@@ -410,15 +410,15 @@ static const char * const gpio_groups[] = { ...@@ -410,15 +410,15 @@ static const char * const gpio_groups[] = {
"gpio29", "gpio30", "gpio31", "gpio32", "gpio33", "gpio34", "gpio35", "gpio29", "gpio30", "gpio31", "gpio32", "gpio33", "gpio34", "gpio35",
"gpio36", "gpio37", "gpio38", "gpio39", "gpio40", "gpio41", "gpio42", "gpio36", "gpio37", "gpio38", "gpio39", "gpio40", "gpio41", "gpio42",
"gpio43", "gpio44", "gpio45", "gpio46", "gpio47", "gpio48", "gpio49", "gpio43", "gpio44", "gpio45", "gpio46", "gpio47", "gpio48", "gpio49",
"gpio50", "gpio51", "gpio52", "gpio52", "gpio53", "gpio53", "gpio54", "gpio50", "gpio51", "gpio52", "gpio53", "gpio54", "gpio55", "gpio56",
"gpio55", "gpio56", "gpio57", "gpio58", "gpio59", "gpio60", "gpio61", "gpio57", "gpio58", "gpio59", "gpio60", "gpio61", "gpio62", "gpio63",
"gpio62", "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68", "gpio69", "gpio70",
"gpio69", "gpio70", "gpio71", "gpio72", "gpio73", "gpio74", "gpio75", "gpio71", "gpio72", "gpio73", "gpio74", "gpio75", "gpio76", "gpio77",
"gpio76", "gpio77", "gpio78", "gpio79", "gpio80", "gpio81", "gpio82", "gpio78", "gpio79", "gpio80", "gpio81", "gpio82", "gpio83", "gpio84",
"gpio83", "gpio84", "gpio85", "gpio86", "gpio87", "gpio88", "gpio89", "gpio85", "gpio86", "gpio87", "gpio88", "gpio89", "gpio90", "gpio91",
"gpio90", "gpio91", "gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98",
"gpio97", "gpio98", "gpio99", "gpio100", "gpio101", "gpio102", "gpio99", "gpio100", "gpio101", "gpio102", "gpio103", "gpio104",
"gpio103", "gpio104", "gpio105", "gpio106", "gpio107", "gpio105", "gpio106", "gpio107",
}; };
static const char * const qdss_stm_groups[] = { static const char * const qdss_stm_groups[] = {
......
...@@ -127,7 +127,7 @@ static int rt2880_pmx_group_enable(struct pinctrl_dev *pctrldev, ...@@ -127,7 +127,7 @@ static int rt2880_pmx_group_enable(struct pinctrl_dev *pctrldev,
if (p->groups[group].enabled) { if (p->groups[group].enabled) {
dev_err(p->dev, "%s is already enabled\n", dev_err(p->dev, "%s is already enabled\n",
p->groups[group].name); p->groups[group].name);
return -EBUSY; return 0;
} }
p->groups[group].enabled = 1; p->groups[group].enabled = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment