Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-pm8941.dtsi

diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi
index 6b16b296f0fa7981c6f8249fea32c696f8085111..3fc9f34f45bbe58add404edd53723c84890f7c42 100644 (file)
--- a/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -26,7 +26,14 @@
                        bias-pull-up;
                };
 
-               charger@1000 {
+               usb_id: misc@900 {
+                       compatible = "qcom,pm8941-misc";
+                       reg = <0x900>;
+                       interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;
+                       interrupt-names = "usb_id";
+               };
+
+               smbb: charger@1000 {
                        compatible = "qcom,pm8941-charger";
                        reg = <0x1000>;
                        interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
@@ -175,5 +182,28 @@
 
                        status = "disabled";
                };
+
+               regulators {
+                       compatible = "qcom,pm8941-regulators";
+                       interrupts = <0x1 0x83 0x2 0>, <0x1 0x84 0x2 0>;
+                       interrupt-names = "ocp-5vs1", "ocp-5vs2";
+                       vin_5vs-supply = <&pm8941_5v>;
+
+                       pm8941_5v: s4 {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5000000>;
+                               regulator-enable-ramp-delay = <500>;
+                       };
+
+                       pm8941_5vs1: 5vs1 {
+                               regulator-enable-ramp-delay = <1000>;
+                               regulator-pull-down;
+                               regulator-over-current-protection;
+                               qcom,ocp-max-retries = <10>;
+                               qcom,ocp-retry-delay = <30>;
+                               qcom,vs-soft-start-strength = <0>;
+                               regulator-initial-mode = <1>;
+                       };
+               };
        };
 };