summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Detheridge <s@sd.ai>2018-09-15 22:15:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-18 09:18:16 +0200
commit5d85d4e0e105ea0d68e7b9f2b76ed6f235c78635 (patch)
tree5435c3046e6e40e6e3e41308b9756105298bf140
parent9f8318a1c50c77f20909b0f615ee4113d935e660 (diff)
downloadlinux-stable-5d85d4e0e105ea0d68e7b9f2b76ed6f235c78635.tar.gz
linux-stable-5d85d4e0e105ea0d68e7b9f2b76ed6f235c78635.tar.bz2
linux-stable-5d85d4e0e105ea0d68e7b9f2b76ed6f235c78635.zip
pinctrl: cannonlake: Fix gpio base for GPP-E
[ Upstream commit 8e2aac333785f91ff74e219a1e78e6bdc1ef2c41 ] The gpio base for GPP-E was set incorrectly to 258 instead of 256, preventing the touchpad working on my Tong Fang GK5CN5Z laptop. Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=200787 Signed-off-by: Simon Detheridge <s@sd.ai> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pinctrl/intel/pinctrl-cannonlake.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-cannonlake.c b/drivers/pinctrl/intel/pinctrl-cannonlake.c
index 6243e7d95e7e..d36afb17f5e4 100644
--- a/drivers/pinctrl/intel/pinctrl-cannonlake.c
+++ b/drivers/pinctrl/intel/pinctrl-cannonlake.c
@@ -382,7 +382,7 @@ static const struct intel_padgroup cnlh_community1_gpps[] = {
static const struct intel_padgroup cnlh_community3_gpps[] = {
CNL_GPP(0, 155, 178, 192), /* GPP_K */
CNL_GPP(1, 179, 202, 224), /* GPP_H */
- CNL_GPP(2, 203, 215, 258), /* GPP_E */
+ CNL_GPP(2, 203, 215, 256), /* GPP_E */
CNL_GPP(3, 216, 239, 288), /* GPP_F */
CNL_GPP(4, 240, 248, CNL_NO_GPIO), /* SPI */
};