Merge "ARM: dts: msm: correct voltage range values for msm8996 ADP camera"

This commit is contained in:
Linux Build Service Account 2017-05-26 06:31:03 -07:00 committed by Gerrit - the friendly Code Review server
commit d469953378

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -128,9 +128,9 @@
cam_vio-supply = <&pm8994_lvs1>;
cam_vana-supply = <&pm8994_l17>;
qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
qcom,cam-vreg-min-voltage = <1300000 0 2500000>;
qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
qcom,cam-vreg-op-mode = <105000 0 80000>;
qcom,cam-vreg-min-voltage = <1300000 0 1800000>;
qcom,cam-vreg-max-voltage = <1300000 0 1800000>;
qcom,cam-vreg-op-mode = <1300000 0 1800000>;
qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;
@ -167,9 +167,9 @@
cam_vio-supply = <&pm8994_lvs1>;
cam_vana-supply = <&pmi8994_boostbypass>;
qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
qcom,cam-vreg-min-voltage = <1000000 0 3150000>;
qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
qcom,cam-vreg-op-mode = <105000 0 80000>;
qcom,cam-vreg-min-voltage = <800000 0 3150000>;
qcom,cam-vreg-max-voltage = <800000 0 3600000>;
qcom,cam-vreg-op-mode = <800000 0 80000>;
qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active &cam_sensor_rear2_active>;
@ -208,9 +208,9 @@
cam_vio-supply = <&pm8994_lvs1>;
cam_vana-supply = <&pm8994_l29>;
qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
qcom,cam-vreg-min-voltage = <1000000 0 2800000>;
qcom,cam-vreg-max-voltage = <1000000 0 2800000>;
qcom,cam-vreg-op-mode = <105000 0 80000>;
qcom,cam-vreg-min-voltage = <800000 0 2500000>;
qcom,cam-vreg-max-voltage = <800000 0 2500000>;
qcom,cam-vreg-op-mode = <800000 0 2500000>;
qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;