Merge "Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9_UPSTREAM_0928" (cd538dbf) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/media/video/msm-cam-eeprom.txt

+51 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,46 @@ First Level Node - CAM EEPROM device
		Value type: <u32>
		Definition: should specify the power on sequence delay time in ms.

		- spiop-read
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI read operation related data.

		- spiop-readseq
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI read sequence operation realted data.

		- spiop-queryid
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI query eeprom id operation related data.

		- spiop-pprog:
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI page program operation related data.

		- spiop-wenable
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI write enable operation related data.

		- spiop-readst
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI read destination operation related data.

		- spiop-erase
		Usage: required
		Value type: <u32>
		Definition: this array provides SPI erase operation related data.

		- eeprom-idx
		Usage: required
		Value type: <u32>
		Definition: this array provides eeprom id realted data.

		- xxxx-supply
		Usage: required
		Value type: <phandle>
		@@ -385,6 +425,10 @@ Example:
		cell-index = <0>;
		reg = <0x0>;
		qcom,eeprom-name = "msm_eeprom";
		eeprom-id0 = <0xF8 0x15>;
		eeprom-id1 = <0xEF 0x15>;
		eeprom-id2 = <0xC2 0x36>;
		eeprom-id3 = <0xC8 0x15>;
		compatible = "qcom,eeprom";
		qcom,slave-addr = <0x60>;
		qcom,num-blocks = <2>;
		@@ -400,6 +444,13 @@ Example:
		qcom,cmm-data-compressed;
		qcom,cmm-data-offset = <0>;
		qcom,cmm-data-size = <0>;
		spiop-read = <0x03 3 0 0 0>;
		spiop-readseq = <0x03 3 0 0 0>;
		spiop-queryid = <0x90 3 0 0 0>;
		spiop-pprog = <0x02 3 0 3 100>;
		spiop-wenable = <0x06 0 0 0 0>;
		spiop-readst = <0x05 0 0 0 0>;
		spiop-erase = <0x20 3 0 10 100>;
		qcom,cam-power-seq-type = "sensor_vreg",
		"sensor_vreg", "sensor_clk",
		"sensor_gpio", "sensor_gpio";

Documentation/devicetree/bindings/media/video/msm-cam-smmu.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,11 @@ Second Level Node - CAM SMMU context bank device or firmware device
		Value type: <string>
		Definition: Should specify a string label to identify the context bank.

		- qcom,secure-cb
		Usage: optional
		Value type: boolean
		Definition: Specifies if the context bank is a secure context bank.

		=============================================
		Third Level Node - CAM SMMU memory map device
		=============================================

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -325,18 +325,8 @@

		msm_cam_smmu_secure {
		compatible = "qcom,msm-cam-smmu-cb";
		iommus = <&apps_smmu 0x1001 0x0>;
		label = "cam-secure";
		cam_secure_iova_mem_map: iova-mem-map {
		/* Secure IO region is approximately 3.4 GB */
		iova-mem-region-io {
		iova-region-name = "io";
		iova-region-start = <0x7400000>;
		iova-region-len = <0xd8c00000>;
		iova-region-id = <0x3>;
		status = "ok";
		};
		};
		qcom,secure-cb;
		};

		msm_cam_smmu_fd {

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -243,18 +243,8 @@

		msm_cam_smmu_secure {
		compatible = "qcom,msm-cam-smmu-cb";
		iommus = <&apps_smmu 0x1001 0x0>;
		label = "cam-secure";
		cam_secure_iova_mem_map: iova-mem-map {
		/* Secure IO region is approximately 3.4 GB */
		iova-mem-region-io {
		iova-region-name = "io";
		iova-region-start = <0x7400000>;
		iova-region-len = <0xd8c00000>;
		iova-region-id = <0x3>;
		status = "ok";
		};
		};
		qcom,secure-cb;
		};
		};

drivers/media/platform/msm/camera/cam_cpas/cpas_top/cam_cpastop_hw.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -402,9 +402,10 @@ static int cam_cpastop_poweroff(struct cam_hw_info *cpas_hw)
		CAM_CPAS_POLL_RETRY_CNT,
		CAM_CPAS_POLL_MIN_USECS, CAM_CPAS_POLL_MAX_USECS);
		if (rc) {
		CAM_ERR(CAM_CPAS,
		CAM_DBG(CAM_CPAS,
		"camnoc flush slave pending trans failed");
		/* Do not return error, passthrough */
		rc = 0;
		}
		}