Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / Documentation / devicetree / bindings / pinctrl / qcom,pmic-gpio.txt

diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
index c3d1914..7648ab0 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
@@ -29,6 +29,7 @@ PMIC's from Qualcomm.
                    "qcom,pm8150b-gpio"
                    "qcom,pm6150-gpio"
                    "qcom,pm6150l-gpio"
+                   "qcom,pmx55-gpio"
 
                    And must contain either "qcom,spmi-gpio" or "qcom,ssbi-gpio"
                    if the device is on an spmi bus or an ssbi bus respectively
@@ -110,6 +111,8 @@ to specify in a pin configuration subnode:
                    gpio1-gpio12 for pm8150l (hole on gpio7)
                    gpio1-gpio10 for pm6150
                    gpio1-gpio12 for pm6150l
+                   gpio1-gpio11 for pmx55 (holes on gpio3, gpio7, gpio10
+                                           and gpio11)
 
 - function:
        Usage: required