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

Commit 730a1c08 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add custom vcsel source for rear tof sensor in Lahaina"... 

Merge "ARM: dts: msm: Add custom vcsel source for rear tof sensor in Lahaina" into camera-kernel.lnx.4.0
parents 516e4e71 54eb427c

lahaina-camera-sensor-cdp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ 
		cam_vdig-supply = <&pm8350_s12>;

		cam_clk-supply = <&cam_cc_titan_top_gdsc>;

		cam_vana-supply = <&pm8008j_l6>;

		cam_vana1-supply = <&pm8008j_l7>;

		cam_v_custom1-supply = <&pm8008j_l7>;

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

			"cam_clk", "cam_vana", "cam_vana1";

			"cam_clk", "cam_vana", "cam_v_custom1";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 1170000 0 2800000 3000000>;

		rgltr-max-voltage = <1800000 2040000 0 2800000 3600000>;

		rgltr-load-current = <5000 680000 0 50000 29000>;

		rgltr-load-current = <200000 680000 0 50000 29000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active
@@ -264,13 +264,13 @@ 
		cam_vdig-supply = <&pm8350_s12>;

		cam_clk-supply = <&cam_cc_titan_top_gdsc>;

		cam_vana-supply = <&pm8008j_l6>;

		cam_vana1-supply = <&pm8008j_l7>;

		cam_v_custom1-supply = <&pm8008j_l7>;

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

			"cam_clk", "cam_vana", "cam_vana1";

			"cam_clk", "cam_vana", "cam_v_custom1";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 1170000 0 2800000 3000000>;

		rgltr-max-voltage = <1800000 2040000 0 2800000 3600000>;

		rgltr-load-current = <5000 680000 0 50000 29000>;

		rgltr-load-current = <200000 680000 0 50000 29000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

lahaina-camera-sensor-mtp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ 
		cam_vdig-supply = <&pm8350_s12>;

		cam_clk-supply = <&cam_cc_titan_top_gdsc>;

		cam_vana-supply = <&pm8008j_l6>;

		cam_vana1-supply = <&pm8008j_l7>;

		cam_v_custom1-supply = <&pm8008j_l7>;

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

			"cam_clk", "cam_vana", "cam_vana1";

			"cam_clk", "cam_vana", "cam_v_custom1";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 1170000 0 2800000 3000000>;

		rgltr-max-voltage = <1800000 2040000 0 2800000 3600000>;

		rgltr-load-current = <5000 680000 0 50000 29000>;

		rgltr-load-current = <200000 680000 0 50000 29000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active
@@ -264,13 +264,13 @@ 
		cam_vdig-supply = <&pm8350_s12>;

		cam_clk-supply = <&cam_cc_titan_top_gdsc>;

		cam_vana-supply = <&pm8008j_l6>;

		cam_vana1-supply = <&pm8008j_l7>;

		cam_v_custom1-supply = <&pm8008j_l7>;

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

			"cam_clk", "cam_vana", "cam_vana1";

			"cam_clk", "cam_vana", "cam_v_custom1";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 1170000 0 2800000 3000000>;

		rgltr-max-voltage = <1800000 2040000 0 2800000 3600000>;

		rgltr-load-current = <5000 680000 0 50000 29000>;

		rgltr-load-current = <200000 680000 0 50000 29000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active