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

Commit 792910a4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d9cc67a8 on remote branch 

Change-Id: Ica11775ce2ddca339050f2c7b78e0dc96e3c4f17
parents 4028abf5 d9cc67a8

lagoon-camera.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ 
			iommus = <&apps_smmu 0xD40 0x20>,

				<&apps_smmu 0xD60 0x20>;

			label = "lrme";

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			lrme_iova_mem_map: iova-mem-map {

				iova-mem-region-shared {

					/* Shared region is 100MB long */
@@ -369,6 +370,7 @@ 
				<&apps_smmu 0x860 0xc0>,

				<&apps_smmu 0x880 0x0>;

			label = "ife";

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			ife_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */

				iova-mem-region-io {
@@ -386,6 +388,7 @@ 
			iommus = <&apps_smmu 0xD00 0x20>,

				<&apps_smmu 0xD20 0x20>;

			label = "jpeg";

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			jpeg_iova_mem_map: iova-mem-map {

				/* IO region is approximately 3.4 GB */

				iova-mem-region-io {
@@ -412,6 +415,8 @@ 
				<&apps_smmu 0xCC0 0x20>,

				<&apps_smmu 0xCE0 0x20>;

			label = "icp";

			qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>;

			iova-region-discard = <0xdff00000 0x300000>;

			icp_iova_mem_map: iova-mem-map {

				iova-mem-region-firmware {

					/* Firmware region is 5MB */
@@ -442,11 +447,12 @@ 
				};



				iova-mem-region-io {

					/* IO region is approximately 3 GB */

					/* IO region is approximately 3.7 GB */

					iova-region-name = "io";

					iova-region-start = <0x10C00000>;

					iova-region-len = <0xCF300000>;

					iova-region-len = <0xee300000>;

					iova-region-id = <0x3>;

					iova-region-discard = <0xdff00000 0x300000>;

					status = "ok";

				};
@@ -466,6 +472,7 @@ 
			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&apps_smmu 0xC80 0x0>;

			label = "cpas-cdm0";

			qcom,iommu-dma-addr-pool = <0x7400000 0xd8c00000>;

			cpas_cdm_iova_mem_map: iova-mem-map {

				iova-mem-region-io {

					/* IO region is approximately 3.4 GB */
@@ -505,7 +512,6 @@ 
		reg = <0xac48000 0x1000>;

		reg-names = "cpas-cdm";

		reg-cam-base = <0x48000>;

		cam_hw_fuse = <CAM_CPAS_SECURE_CAMERA_ENABLE 0x007801f0 23>;

		interrupts = <GIC_SPI 469 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "cpas-cdm";

		regulator-names = "camss";
@@ -805,6 +811,7 @@ 
		num-a5 = <1>;

		num-ipe = <1>;

		num-bps = <1>;

		icp_pc_en;

		status = "ok";

	};

scuba-camera-sensor-idp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -230,11 +230,11 @@ 
		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear1_reset_active>

				&cam_sensor_rear1_reset_active

				&cam_sensor_csi_mux_oe_active

				&cam_sensor_csi_mux_sel_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear1_reset_suspend>

				&cam_sensor_rear1_reset_suspend

				&cam_sensor_csi_mux_oe_suspend

				&cam_sensor_csi_mux_sel_suspend>;

		gpios = <&tlmm 21 0>,