Commit 8066cf14 authored by Mika Westerberg's avatar Mika Westerberg Committed by Guillaume Tucker
Browse files

pinctrl: intel: Only restore pins that are used by the driver

Dell XPS 13 (and maybe some others) uses a GPIO (CPU_GP_1) during suspend
to explicitly disable USB touchscreen interrupt. This is done to prevent
situation where the lid is closed the touchscreen is left functional.

The pinctrl driver (wrongly) assumes it owns all pins which are owned by
host and not locked down. It is perfectly fine for BIOS to use those pins
as it is also considered as host in this context.

What happens is that when the lid of Dell XPS 13 is closed, the BIOS
configures CPU_GP_1 low disabling the touchscreen interrupt. During resume
we restore all host owned pins to the known state which includes CPU_GP_1
and this overwrites what the BIOS has programmed there causing the
touchscreen to fail as no interrupts are reaching the CPU anymore.

Fix this by restoring only those pins we know are explicitly requested by
the kernel one way or other.


Reported-by: default avatarAceLan Kao <>
Tested-by: default avatarAceLan Kao <>
Signed-off-by: default avatarMika Westerberg <>
Signed-off-by: default avatarLinus Walleij <>
Signed-off-by: Guillaume Tucker's avatarGuillaume Tucker <>
parent adaa02f0
......@@ -23,6 +23,7 @@
#include <linux/pinctrl/pinconf.h>
#include <linux/pinctrl/pinconf-generic.h>
#include "../core.h"
#include "pinctrl-intel.h"
/* Offset from regs */
......@@ -1049,6 +1050,26 @@ int intel_pinctrl_remove(struct platform_device *pdev)
static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned pin)
const struct pin_desc *pd = pin_desc_get(pctrl->pctldev, pin);
if (!pd || !intel_pad_usable(pctrl, pin))
return false;
* Only restore the pin if it is actually in use by the kernel (or
* by userspace). It is possible that some pins are used by the
* BIOS during resume and those are not always locked down so leave
* them alone.
if (pd->mux_owner || pd->gpio_owner ||
gpiochip_line_is_irq(&pctrl->chip, pin))
return true;
return false;
int intel_pinctrl_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
......@@ -1062,7 +1083,7 @@ int intel_pinctrl_suspend(struct device *dev)
const struct pinctrl_pin_desc *desc = &pctrl->soc->pins[i];
u32 val;
if (!intel_pad_usable(pctrl, desc->number))
if (!intel_pinctrl_should_save(pctrl, desc->number))
val = readl(intel_get_padcfg(pctrl, desc->number, PADCFG0));
......@@ -1123,7 +1144,7 @@ int intel_pinctrl_resume(struct device *dev)
void __iomem *padcfg;
u32 val;
if (!intel_pad_usable(pctrl, desc->number))
if (!intel_pinctrl_should_save(pctrl, desc->number))
padcfg = intel_get_padcfg(pctrl, desc->number, PADCFG0);
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