summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-09-07 09:59:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-09-07 09:59:57 -0700
commit872765620781607809fddbfdc2823ab7f769b698 (patch)
treeae9406ea685df20b71160d3e07b5d3bd49ef3217
parentb31c4492884252a8360f312a0ac2049349ddf603 (diff)
parent602cb14e310a7a32c4f27d1f16c4614c790c7f6f (diff)
downloadlinux-stable-872765620781607809fddbfdc2823ab7f769b698.tar.gz
linux-stable-872765620781607809fddbfdc2823ab7f769b698.tar.bz2
linux-stable-872765620781607809fddbfdc2823ab7f769b698.zip
Merge tag 'pinctrl-v6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fix from Linus Walleij: "A single fix for Qualcomm laptops that are affected by missing wakeup IRQs" * tag 'pinctrl-v6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: qcom: x1e80100: Bypass PDC wakeup parent for now
-rw-r--r--drivers/pinctrl/qcom/pinctrl-x1e80100.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-x1e80100.c b/drivers/pinctrl/qcom/pinctrl-x1e80100.c
index 65ed933f05ce..abfcdd3da9e8 100644
--- a/drivers/pinctrl/qcom/pinctrl-x1e80100.c
+++ b/drivers/pinctrl/qcom/pinctrl-x1e80100.c
@@ -1839,7 +1839,9 @@ static const struct msm_pinctrl_soc_data x1e80100_pinctrl = {
.ngroups = ARRAY_SIZE(x1e80100_groups),
.ngpios = 239,
.wakeirq_map = x1e80100_pdc_map,
- .nwakeirq_map = ARRAY_SIZE(x1e80100_pdc_map),
+ /* TODO: Enabling PDC currently breaks GPIO interrupts */
+ .nwakeirq_map = 0,
+ /* .nwakeirq_map = ARRAY_SIZE(x1e80100_pdc_map), */
.egpio_func = 9,
};