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

Commit ea0cb145 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '6fe599d9' into msm-4.9 - PC200.1"

parents aacaa350 7802af74

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

+13 −4
Original line number Diff line number Diff line
@@ -338,17 +338,17 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0xd911000>;

					iova-region-len = <0xd26ef000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};



				iova-mem-qdss-region {

					/* qdss region is approximately 64K */

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0xd900000>;

					iova-region-len = <0x10000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;

					status = "ok";
@@ -911,6 +911,9 @@ 
	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam-ipe";

		reg = <0xac87000 0x3000>;

		reg-names = "ipe0_top";

		reg-cam-base = <0x87000>;

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -938,6 +941,9 @@ 
	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam-ipe";

		reg = <0xac91000 0x3000>;

		reg-names = "ipe1_top";

		reg-cam-base = <0x91000>;

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -965,6 +971,9 @@ 
	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam-bps";

		reg = <0xac6f000 0x3000>;

		reg-names = "bps_top";

		reg-cam-base = <0x6f000>;

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",

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

+13 −4
Original line number Diff line number Diff line
@@ -311,17 +311,17 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0xd911000>;

					iova-region-len = <0xd26ef000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};



				iova-mem-qdss-region {

					/* qdss region is approximately 64K */

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0xd900000>;

					iova-region-len = <0x10000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;

					status = "ok";
@@ -881,6 +881,9 @@ 
	cam_ipe0: qcom,ipe0 {

		cell-index = <0>;

		compatible = "qcom,cam-ipe";

		reg = <0xac87000 0x3000>;

		reg-names = "ipe0_top";

		reg-cam-base = <0x87000>;

		regulator-names = "ipe0-vdd";

		ipe0-vdd-supply = <&ipe_0_gdsc>;

		clock-names = "ipe_0_ahb_clk",
@@ -908,6 +911,9 @@ 
	cam_ipe1: qcom,ipe1 {

		cell-index = <1>;

		compatible = "qcom,cam-ipe";

		reg = <0xac91000 0x3000>;

		reg-names = "ipe1_top";

		reg-cam-base = <0x91000>;

		regulator-names = "ipe1-vdd";

		ipe1-vdd-supply = <&ipe_1_gdsc>;

		clock-names = "ipe_1_ahb_clk",
@@ -935,6 +941,9 @@ 
	cam_bps: qcom,bps {

		cell-index = <0>;

		compatible = "qcom,cam-bps";

		reg = <0xac6f000 0x3000>;

		reg-names = "bps_top";

		reg-cam-base = <0x6f000>;

		regulator-names = "bps-vdd";

		bps-vdd-supply = <&bps_gdsc>;

		clock-names = "bps_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -248,17 +248,17 @@ 
				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					iova-region-name = "io";

					iova-region-start = <0xd911000>;

					iova-region-len = <0xd26ef000>;

					iova-region-start = <0xda00000>;

					iova-region-len = <0xd2500000>;

					iova-region-id = <0x3>;

					status = "ok";

				};



				iova-mem-qdss-region {

					/* qdss region is approximately 64K */

					/* qdss region is approximately 1MB */

					iova-region-name = "qdss";

					iova-region-start = <0xd900000>;

					iova-region-len = <0x10000>;

					iova-region-len = <0x100000>;

					iova-region-id = <0x5>;

					qdss-phy-addr = <0x16790000>;

					status = "ok";

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -1884,7 +1884,7 @@ int cam_fd_hw_mgr_init(struct device_node *of_node, 
	}



	rc = cam_req_mgr_workq_create("cam_fd_worker", CAM_FD_WORKQ_NUM_TASK,

		&g_fd_hw_mgr.work, CRM_WORKQ_USAGE_IRQ);

		&g_fd_hw_mgr.work, CRM_WORKQ_USAGE_IRQ, 0);

	if (rc) {

		CAM_ERR(CAM_FD, "Unable to create a worker, rc=%d", rc);

		goto detach_smmu;

drivers/media/platform/msm/camera/cam_icp/fw_inc/hfi_intf.h

+6 −0
Original line number Diff line number Diff line
@@ -153,4 +153,10 @@ int hfi_cmd_ubwc_config(uint32_t *ubwc_cfg); 
int cam_hfi_resume(struct hfi_mem_info *hfi_mem,

	void __iomem *icp_base, bool debug);



/**

 * cam_hfi_queue_dump() - utility function to dump hfi queues

 */

void cam_hfi_queue_dump(void);





#endif /* _HFI_INTF_H_ */