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

Commit f6239bef 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 apq8084"

parents 6cfec4d3 f14feb7a

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

+16 −14
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 
		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

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

	};



	qcom,camera@20 {
@@ -32,13 +38,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,
@@ -107,13 +111,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

arch/arm/boot/dts/qcom/apq8084-camera-sensor-liquid.dtsi

+12 −10
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

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

	};



	qcom,camera@20 {
@@ -31,13 +37,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				"cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,
@@ -107,9 +111,7 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

+16 −14
Original line number Diff line number Diff line
@@ -17,6 +17,12 @@ 
		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

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

	};



	qcom,camera@20 {
@@ -31,13 +37,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,
@@ -107,13 +111,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,

arch/arm/boot/dts/qcom/apq8084-camera-sensor-sbc.dtsi

+16 −14
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 
		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

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

	};



	qcom,camera@20 {
@@ -32,13 +38,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs2>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2850000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2850000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2850000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2850000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,
@@ -111,13 +115,11 @@ 
		cam_vdig-supply = <&pma8084_l27>;

		cam_vio-supply = <&pma8084_lvs2>;

		cam_vana-supply = <&pma8084_l17>;

		cam_vaf-supply = <&pma8084_l23>;

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

				     "cam_vaf";

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000 2700000>;

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

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

		gpios = <&msmgpio 15 0>,

			<&msmgpio 36 0>,