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

Commit 56ee550b 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 msm8226"

parents 2c842e3b 67275793

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

+27 −21
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
		reg = <0x6c>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8226_l15>;

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

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

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

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

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

	};



	actuator1: qcom,actuator@36 {
@@ -36,6 +42,12 @@ 
		reg = <0x36>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8226_l15>;

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

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

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

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

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

	};



	qcom,camera@6f {
@@ -51,13 +63,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,
@@ -88,13 +98,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,
@@ -204,13 +212,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,

			<&msmgpio 36 0>;

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

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

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8226_l15>;

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

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

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

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

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

	};



	qcom,camera@6f {
@@ -44,13 +50,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,
@@ -118,13 +122,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,

arch/arm/boot/dts/qcom/msm8226-camera-sensor-qrd.dtsi

+21 −21
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
		reg = <0x6c>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8226_l15>;

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

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

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

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

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

	};



	eeprom0: qcom,eeprom@6c {
@@ -118,13 +124,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,
@@ -266,13 +270,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <120000 0 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,
@@ -455,13 +457,11 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

		cam_vaf-supply = <&pm8226_l15>;

		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 = <1200000 0 2850000 2800000>;

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

		qcom,cam-vreg-op-mode = <200000 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 = <1200000 0 2850000>;

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

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

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

		gpios = <&msmgpio 26 0>,

			<&msmgpio 37 0>,