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

Commit a7ee9ae9 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add VAF to the eeprom node" into dev/msm-4.14-camx

parents aec88a64 e3764cd7

arch/arm64/boot/dts/qcom/sdmmagpie-camera-sensor-idp.dtsi

+11 −12
Original line number Diff line number Diff line
@@ -71,17 +71,17 @@ 
		cell-index = <0>;

		reg = <0>;

		compatible = "qcom,eeprom";

		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l1>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2800000 1100000 0>;

		rgltr-max-voltage = <1800000 2800000 1100000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		rgltr-min-voltage = <1800000 2800000 1100000 0 2900000>;

		rgltr-max-voltage = <1800000 2800000 1100000 0 2900000>;

		rgltr-load-current = <0 80000 105000 0 100000>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -108,17 +108,17 @@ 
		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,eeprom";

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2800000 1200000 0>;

		rgltr-max-voltage = <1800000 2800000 1200000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		rgltr-min-voltage = <1800000 2800000 1200000 0 2900000>;

		rgltr-max-voltage = <1800000 2800000 1200000 0 2900000>;

		rgltr-load-current = <0 80000 105000 0 100000>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -132,7 +132,6 @@ 
		gpio-req-tbl-flags = <1 0>;

		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";
@@ -155,7 +154,7 @@ 
		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2800000 1050000 0>;

		rgltr-max-voltage = <1800000 2800000 1050000 0>;

		rgltr-load-current = <0 80000 105000 0 0>;

		rgltr-load-current = <0 80000 105000 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active