summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-29 11:20:55 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-29 11:20:55 -0700
commit522270d25b53cc7686ab7abba3ed3914cc89cfcb (patch)
tree8bb1884b402403feeddc4968d32b70537bb05174 /arch
parent658a0f5fe18b653689f400c8dd5d3888fac210b4 (diff)
parentc9f2565720ebadb158179cde6ab073c60b7845d4 (diff)
Merge "ARM: dts: msm: correct PM8005 S1 min/max voltage for msmcobalt"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
index 86bc048adeb5..c2d45ec3ef07 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
@@ -533,7 +533,7 @@
regulator-name = "pm8005_s1";
status = "okay";
regulator-min-microvolt = <524000>;
- regulator-max-microvolt = <1032000>;
+ regulator-max-microvolt = <1100000>;
qcom,enable-time = <500>;
};
};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index 516822ec527f..44d646b4f0c0 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -525,6 +525,11 @@
qcom,cpr-scaled-open-loop-voltage-as-ceiling;
};
+&pm8005_s1 {
+ regulator-min-microvolt = <516000>;
+ regulator-max-microvolt = <1088000>;
+};
+
&gfx_cpr {
compatible = "qcom,cpr4-msmcobalt-v2-mmss-regulator";
};