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

Commit bfe62607 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: Fix camera flash LED configurations for sm8150 platforms" into msm-4.14

parents 410cf208 11be0f38

arch/arm64/boot/dts/qcom/sm8150-camera-sensor-cdp.dtsi

+22 −22
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash0 &pm855l_flash1>;

		torch-source = <&pm855l_torch0 &pm855l_torch1>;

		switch-source = <&pm855l_switch0>;

		switch-source = <&pm855l_switch2>;

		status = "ok";

	};
@@ -28,7 +28,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash0 &pm855l_flash1>;

		torch-source = <&pm855l_torch0 &pm855l_torch1>;

		switch-source = <&pm855l_switch0>;

		switch-source = <&pm855l_switch2>;

		status = "ok";

	};
@@ -38,7 +38,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash1>;

		torch-source = <&pm855l_torch1>;

		switch-source = <&pm855l_switch1>;

		switch-source = <&pm855l_switch0>;

		status = "ok";

	};

};
@@ -57,8 +57,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -70,8 +70,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -83,8 +83,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -96,8 +96,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

		status = "ok";

	};
@@ -114,8 +114,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-min-voltage = <0 2850000 1200000 0 2856000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2856000>;

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

		gpio-no-mux = <0>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-min-voltage = <0 2850000 1200000 0 2856000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2856000>;

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

		gpio-no-mux = <0>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0>;

		rgltr-max-voltage = <0 2850000 1200000 0>;

		rgltr-min-voltage = <0 2856000 1200000 0>;

		rgltr-max-voltage = <0 2856000 1200000 0>;

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -308,7 +308,7 @@ 
		compatible = "qcom,cam-sensor";

		reg = <0x02>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_front>;
@@ -320,8 +320,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0>;

		rgltr-max-voltage = <0 2850000 1200000 0>;

		rgltr-min-voltage = <0 2856000 1200000 0>;

		rgltr-max-voltage = <0 2856000 1200000 0>;

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

		gpio-no-mux = <0>;

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

arch/arm64/boot/dts/qcom/sm8150-camera-sensor-mtp.dtsi

+22 −22
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash0 &pm855l_flash1>;

		torch-source = <&pm855l_torch0 &pm855l_torch1>;

		switch-source = <&pm855l_switch0>;

		switch-source = <&pm855l_switch2>;

		status = "ok";

	};
@@ -28,7 +28,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash0 &pm855l_flash1>;

		torch-source = <&pm855l_torch0 &pm855l_torch1>;

		switch-source = <&pm855l_switch0>;

		switch-source = <&pm855l_switch2>;

		status = "ok";

	};
@@ -38,7 +38,7 @@ 
		compatible = "qcom,camera-flash";

		flash-source = <&pm855l_flash1>;

		torch-source = <&pm855l_torch1>;

		switch-source = <&pm855l_switch1>;

		switch-source = <&pm855l_switch0>;

		status = "ok";

	};

};
@@ -57,8 +57,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -70,8 +70,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -83,8 +83,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

	};
@@ -96,8 +96,8 @@ 
		cam_vaf-supply = <&pm8009_s2>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2850000>;

		rgltr-max-voltage = <2850000>;

		rgltr-min-voltage = <2856000>;

		rgltr-max-voltage = <2856000>;

		rgltr-load-current = <0>;

		status = "ok";

	};
@@ -114,8 +114,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-min-voltage = <0 2850000 1200000 0 2856000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2856000>;

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

		gpio-no-mux = <0>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2850000>;

		rgltr-min-voltage = <0 2850000 1200000 0 2856000>;

		rgltr-max-voltage = <0 2850000 1200000 0 2856000>;

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

		gpio-no-mux = <0>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0>;

		rgltr-max-voltage = <0 2850000 1200000 0>;

		rgltr-min-voltage = <0 2856000 1200000 0>;

		rgltr-max-voltage = <0 2856000 1200000 0>;

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -308,7 +308,7 @@ 
		compatible = "qcom,cam-sensor";

		reg = <0x02>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_front>;
@@ -320,8 +320,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 2850000 1200000 0>;

		rgltr-max-voltage = <0 2850000 1200000 0>;

		rgltr-min-voltage = <0 2856000 1200000 0>;

		rgltr-max-voltage = <0 2856000 1200000 0>;

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

		gpio-no-mux = <0>;

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