diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 15:14:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 15:14:32 -0800 |
| commit | 208399ba94c1c4bf2499cb7cfd9d409f6d2de6c6 (patch) | |
| tree | 07d3c109a215a60d809d32ff7ec32a90d673c40c | |
| parent | dc30c737b083a283221628514759c220c9c9087f (diff) | |
| parent | 83dd0b0ca06f195c738cfede96b6cd62c4ec9101 (diff) | |
Merge "ARM: dts: msm: Change LAB precharge time to 500us in pmicobalt"
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/qpnp-labibb-regulator.txt | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/regulator/qpnp-labibb-regulator.txt b/Documentation/devicetree/bindings/regulator/qpnp-labibb-regulator.txt index b3775ae44de0..0ac3a1f73fa9 100644 --- a/Documentation/devicetree/bindings/regulator/qpnp-labibb-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qpnp-labibb-regulator.txt @@ -82,8 +82,10 @@ LAB subnode required properties: are 25, 50, 75 and 100. - qcom,qpnp-lab-nfet-size: NFET size in percentage. Supported values are 25, 50, 75 and 100. -- qcom,qpnp-lab-max-precharge-time: Precharge time in us of LAB regulator. +- qcom,qpnp-lab-max-precharge-time: Precharge time in uS for LAB regulator. Supported values are 200, 300, 400 and 500. + Suggested values for LCD and AMOLED mode + are 500 and 300uS respectively. - qcom,qpnp-lab-switching-clock-frequency: The PWM switching clock frequency in kHz of Lab regulator, Supported values are: 3200, 2740, 2400, 2130, 1920, diff --git a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi index f4ca25668814..04333c7df309 100644 --- a/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi @@ -575,7 +575,7 @@ qcom,qpnp-lab-ps-enable; qcom,qpnp-lab-nfet-size = <100>; qcom,qpnp-lab-pfet-size = <100>; - qcom,qpnp-lab-max-precharge-time = <300>; + qcom,qpnp-lab-max-precharge-time = <500>; }; }; |