--- /dev/null
+From 534589d91a7b7e9c7ce69ace16fd149b16fa4b7f Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 31 May 2018 17:58:13 +0200
+Subject: Revert "pinctrl: msm: Use dynamic GPIO numbering"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 7d8e0341b2b93fb505cd75e8e0d4f1911d0fa0fe which is
+commit a7aa75a2a7dba32594291a71c3704000a2fd7089 upstream.
+
+There's been too many complaints about this. Personally I think it's
+going to blow up when people hit this in mainline, but hey, it's not my
+systems. At least we don't have to backport the mess to the stable
+kernels to give them some more life to live unscathed :)
+
+Reported-by: Timur Tabi <timur@codeaurora.org>
+Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
+Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
+Cc: Linus Walleij <linus.walleij@linaro.org>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pinctrl/qcom/pinctrl-msm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pinctrl/qcom/pinctrl-msm.c
++++ b/drivers/pinctrl/qcom/pinctrl-msm.c
+@@ -818,7 +818,7 @@ static int msm_gpio_init(struct msm_pinc
+ return -EINVAL;
+
+ chip = &pctrl->chip;
+- chip->base = -1;
++ chip->base = 0;
+ chip->ngpio = ngpio;
+ chip->label = dev_name(pctrl->dev);
+ chip->parent = pctrl->dev;