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

Commit e2e1f9f2 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM commit 'b644f8d2' 09/13"

parents 315ed7f6 4c33b1ae

arch/arm64/boot/dts/qcom/sm6150-camera-sensor-qrd.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
		cell-index = <0>;

		reg = <0x00 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash0>;

		torch-source = <&pm6150l_torch1>;

		switch-source = <&pm6150l_switch0>;

		flash-source = <&pm6150l_flash0 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};
@@ -29,9 +29,9 @@ 
		cell-index = <1>;

		reg = <0x01 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash1>;

		torch-source = <&pm6150l_torch1>;

		switch-source = <&pm6150l_switch1>;

		flash-source = <&pm6150l_flash0 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};
@@ -108,7 +108,7 @@ 
		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

		rgltr-load-current = <100000>;

	};



	actuator_front: qcom,actuator@1 {
@@ -121,7 +121,7 @@ 
		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <0>;

		rgltr-load-current = <100000>;

	};



	eeprom_rear: qcom,eeprom@0 {
@@ -138,7 +138,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -175,7 +175,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -212,7 +212,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -296,7 +296,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

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

+8 −5
Original line number Diff line number Diff line
@@ -389,15 +389,18 @@ 
		pinctrl-0 = <&cam_sensor_mclk3_active

				 &cam_sensor_active_iris>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				 &cam_sensor_active_iris>;

				 &cam_sensor_suspend_iris>;

		gpios = <&tlmm 16 0>,

			<&tlmm 23 0>;

			<&tlmm 23 0>,

			<&tlmm 26 0>;

		gpio-reset = <1>;

		gpio-req-tbl-num = <0 1>;

		gpio-req-tbl-flags = <1 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 1>;

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

					"CAM_RESET3";

					"CAM_RESET3",

					"IMG_START";

		sensor-mode = <0>;

		cci-device = <1>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;

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

+7 −4
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ 
					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0xda00000>;

					iova-region-len = <0xacdfffff>;

					iova-region-len = <0xace00000>;

					iova-region-id = <0x3>;

					status = "ok";

				};
@@ -1031,11 +1031,12 @@ 
			<&clock_camcc CAM_CC_IPE_0_CLK>;



		clock-rates =

			<0 0 0 300000000 0>,

			<0 0 0 475000000 0>,

			<0 0 0 520000000 0>,

			<0 0 0 600000000 0>,

			<0 0 0 600000000 0>;

		clock-cntl-level = "svs", "svs_l1",

		clock-cntl-level = "lowsvs", "svs", "svs_l1",

				"nominal", "turbo";

		status = "ok";

	};
@@ -1064,11 +1065,12 @@ 
			<&clock_camcc CAM_CC_IPE_1_CLK>;



		clock-rates =

			<0 0 0 300000000 0>,

			<0 0 0 475000000 0>,

			<0 0 0 520000000 0>,

			<0 0 0 600000000 0>,

			<0 0 0 600000000 0>;

		clock-cntl-level = "svs", "svs_l1",

		clock-cntl-level = "lowsvs", "svs", "svs_l1",

				"nominal", "turbo";

		status = "ok";

	};
@@ -1097,11 +1099,12 @@ 
			<&clock_camcc CAM_CC_BPS_CLK>;



		clock-rates =

			<0 0 0 200000000 0>,

			<0 0 0 400000000 0>,

			<0 0 0 480000000 0>,

			<0 0 0 600000000 0>,

			<0 0 0 600000000 0>;

		clock-cntl-level = "svs", "svs_l1",

		clock-cntl-level = "lowsvs", "svs", "svs_l1",

				"nominal", "turbo";

		status = "ok";

	};

arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -3879,12 +3879,12 @@ 
		cam_sensor_active_iris: cam_sensor_active_iris {

			/* RESET IRIS */

			mux {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				function = "gpio";

			};



			config {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};
@@ -3893,12 +3893,12 @@ 
		cam_sensor_suspend_iris: cam_sensor_suspend_iris {

			/* RESET IRIS */

			mux {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				function = "gpio";

			};



			config {

				pins = "gpio23";

				pins = "gpio23", "gpio26";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

				output-low;

drivers/media/platform/msm/camera/cam_core/cam_context.c

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ int cam_context_handle_crm_apply_req(struct cam_context *ctx, 
		return -EINVAL;

	}



	mutex_lock(&ctx->ctx_mutex);

	if (ctx->state_machine[ctx->state].crm_ops.apply_req) {

		rc = ctx->state_machine[ctx->state].crm_ops.apply_req(ctx,

			apply);
@@ -172,7 +171,6 @@ int cam_context_handle_crm_apply_req(struct cam_context *ctx, 
			ctx->dev_hdl, ctx->state);

		rc = -EPROTO;

	}

	mutex_unlock(&ctx->ctx_mutex);



	return rc;

}