summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-01-28 14:31:13 +0100
committerLinus Walleij <linus.walleij@linaro.org>2019-01-28 14:31:13 +0100
commit67e436ffd648441a149308239d22e1ff46096d60 (patch)
tree4742299b6ad061d90135cb9ab406087bcd8dbf4a /Documentation
parentdt-bindings: imx: Add pinctrl binding doc for imx8mm (diff)
parentspmi: pmic-arb: revert "disassociate old virq if hwirq mapping already exists" (diff)
downloadlinux-67e436ffd648441a149308239d22e1ff46096d60.tar.xz
linux-67e436ffd648441a149308239d22e1ff46096d60.zip
Merge branch 'ib-qcom-spmi' of /home/linus/linux-gpio into devel
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
index 759aa1732e48..7f64a7e92c28 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
@@ -19,6 +19,7 @@ PMIC's from Qualcomm.
"qcom,pm8998-gpio"
"qcom,pma8084-gpio"
"qcom,pmi8994-gpio"
+ "qcom,pmi8998-gpio"
"qcom,pms405-gpio"
And must contain either "qcom,spmi-gpio" or "qcom,ssbi-gpio"