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

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

Merge "ARM: dts: msm: Correct ldo voltages as per new regulator changes" into dev/msm-4.14-camx

parents 5c033ffa ada807c0

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

+13 −11
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ 
		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_vdig-supply = <&pm8009_l1>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -134,6 +134,7 @@ 
		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;
@@ -150,8 +151,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -167,7 +168,8 @@ 
		gpio-req-tbl-label = "CAMIF_MCLK2",

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		cci-device = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";
@@ -188,13 +190,13 @@ 
		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_vdig-supply = <&pm8009_l1>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -277,8 +279,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

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