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

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

Merge "Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 07/03"

parents 5542ee99 d403a7fc

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

+3 −3
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ 
		mipi-csi-vdd-supply = <&pm6150l_l3>;

		clocks = <&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY0_CLK>,

			<&clock_camcc CAM_CC_CSIPHY2_CLK>,

			<&clock_camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI2PHYTIMER_CLK>;

			<&clock_camcc CAM_CC_CSIPHY3_CLK>,

			<&clock_camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI3PHYTIMER_CLK>;

		clock-names = "cphy_rx_clk_src",

			"csiphy0_clk",

			"csiphy3_clk",

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

+190 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -47,6 +47,16 @@ 
		pinctrl-0 = <&flash_led3_front_en>;

	};



	led_flash_rear_aux2: qcom,camera-flash@3 {

		cell-index = <3>;

		reg = <0x03 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash0 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};



	camera_ldo: gpio-regulator@0 {

		compatible = "regulator-fixed";

		reg = <0x00 0x00>;
@@ -135,6 +145,19 @@ 
		rgltr-load-current = <100000>;

	};



	actuator_triple_tele: qcom,actuator@3 {

		cell-index = <3>;

		reg = <0x3>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&pm6150_l19>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <100000>;

	};



	ois_rear: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -260,6 +283,43 @@ 
		clock-rates = <24000000>;

	};



	eeprom_triple_rear_aux: qcom,eeprom@3 {

		cell-index = <3>;

		reg = <3>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana0_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm6150_l19>;

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

			"cam_clk", "cam_vaf";

		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 100000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 47 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";
@@ -432,4 +492,133 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		reg = <0x4>;

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear>;

		actuator-src = <&actuator_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana0_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 47 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@5 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		reg = <0x5>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_triple_tele>;

		eeprom-src = <&eeprom_triple_rear_aux>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 29 0>,

			<&tlmm 45 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@6 {

		cell-index = <6>;

		compatible = "qcom,cam-sensor";

		reg = <0x6>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		led-flash-src = <&led_flash_rear_aux2>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 30 0>,

			<&tlmm 37 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

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

+15 −4
Original line number Diff line number Diff line
@@ -459,6 +459,17 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
				"[%s][%d] : Moving req[%llu] from free_list to pending_list",

				ctx->dev_name, ctx->ctx_id, req->request_id);



		for (j = 0; j < req->num_in_map_entries; j++) {

			rc = cam_sync_check_valid(

				req->in_map_entries[j].sync_id);

			if (rc) {

				CAM_ERR(CAM_CTXT,

					"invalid in map sync object %d",

					req->in_map_entries[j].sync_id);

				goto put_ref;

			}

		}



		for (j = 0; j < req->num_in_map_entries; j++) {

			cam_context_getref(ctx);

			rc = cam_sync_register_callback(
@@ -480,7 +491,9 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
						ctx->dev_name, ctx->ctx_id,

						req->request_id);



				goto put_ctx_ref;

				cam_context_putref(ctx);

				goto put_ref;



			}

			CAM_DBG(CAM_CTXT, "register in fence cb: %d ret = %d",

				req->in_map_entries[j].sync_id, rc);
@@ -492,9 +505,7 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
			ctx->dev_name, ctx->ctx_id);



	return rc;

put_ctx_ref:

	for (j; j >= 0; j--)

		cam_context_putref(ctx);



put_ref:

	for (--i; i >= 0; i--) {

		if (cam_sync_put_obj_ref(req->out_map_entries[i].sync_id))

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+7 −0
Original line number Diff line number Diff line
@@ -1234,6 +1234,13 @@ static int cam_cpas_hw_register_client(struct cam_hw_info *cpas_hw, 
	rc = cam_common_util_get_string_index(soc_private->client_name,

		soc_private->num_clients, client_name, &client_indx);



	if (rc) {

		CAM_ERR(CAM_CPAS, "No match found for client %s",

			client_name);

		mutex_unlock(&cpas_hw->hw_mutex);

		return rc;

	}



	mutex_lock(&cpas_core->client_mutex[client_indx]);



	if (rc || !CAM_CPAS_CLIENT_VALID(client_indx) ||

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+210 −116

File changed.

Preview size limit exceeded, changes collapsed.