Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit effbfb1b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Move actuator voltage regulator msm8610"

parents 3e2735cb 00d26c22

arch/arm/boot/dts/qcom/msm8610-camera-sensor-cdp-mtp.dtsi

+22 −22
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014, 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
@@ -36,6 +36,12 @@ 
		reg = <0x6c>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8110_l16>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

		qcom,cam-vreg-min-voltage = <3000000>;

		qcom,cam-vreg-max-voltage = <3000000>;

		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@6a {
@@ -124,13 +130,11 @@ 
		cam_vdig-supply = <&pm8110_l2>;

		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

		cam_vaf-supply = <&pm8110_l16>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							 "cam_vaf";

		qcom,cam-vreg-type = <0 0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000 100000>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 13 0>,

			<&msmgpio 21 0>,
@@ -162,13 +166,11 @@ 
		cam_vdig-supply = <&pm8110_l2>;

		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

		cam_vaf-supply = <&pm8110_l16>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							 "cam_vaf";

		qcom,cam-vreg-type = <0 0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000 100000>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 13 0>,

			<&msmgpio 21 0>,
@@ -274,13 +276,11 @@ 
		cam_vdig-supply = <&pm8110_l2>;

		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

		cam_vaf-supply = <&pm8110_l16>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							 "cam_vaf";

		qcom,cam-vreg-type = <0 0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000 3000000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000 100000>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 0 0>;

		qcom,cam-vreg-min-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 2850000>;

		qcom,cam-vreg-op-mode = <200000 8000 80000>;

		qcom,gpio-no-mux = <0>;

		gpios = <&msmgpio 13 0>,

			<&msmgpio 21 0>,