diff options
| author | Lucas Wei <lucaswei@google.com> | 2021-05-31 12:14:58 +0800 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2021-05-31 12:14:58 +0800 |
| commit | bac014853ace9398eb34866209e1eb183c7fdfbe (patch) | |
| tree | b2bbbead542004063839247896df0331cd581af4 /qcom/msm8937-camera.dtsi | |
| parent | 84ee10ed83c441b63b9ab3c0710351a7fba4fa14 (diff) | |
| parent | ac2071f00e6c3fc0207dc274c8a8cca46e4fe0bf (diff) | |
| download | devicetree-bac014853ace9398eb34866209e1eb183c7fdfbe.tar.gz | |
Merge android-msm-pixel-4.19 into android-msm-barbet-4.19android-s-v2-beta-3_r0.5android-s-v2-beta-2_r0.5android-s-v2-beta-1_r0.5android-s-qpr3-beta-3_r0.4android-s-qpr3-beta-2_r0.4android-s-qpr3-beta-1_r0.4android-s-beta-5_r0.6android-12.1.0_r0.5android-12.1.0_r0.34android-12.1.0_r0.27android-12.1.0_r0.21android-12.1.0_r0.15android-12.0.0_r0.7android-12.0.0_r0.41android-12.0.0_r0.35android-12.0.0_r0.25android-12.0.0_r0.15android-msm-barbet-4.19-s-v2-beta-3android-msm-barbet-4.19-s-v2-beta-1android-msm-barbet-4.19-s-qpr3-beta-3android-msm-barbet-4.19-s-qpr3-beta-2android-msm-barbet-4.19-s-beta-5android-msm-barbet-4.19-android12Landroid-msm-barbet-4.19-android12-v2-beta-2android-msm-barbet-4.19-android12-qpr3android-msm-barbet-4.19-android12-qpr1android-msm-barbet-4.19-android12
Bug: 187909050
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I733f40c91d84882e434bb34eeb5a197e94e22f98
Diffstat (limited to 'qcom/msm8937-camera.dtsi')
| -rw-r--r-- | qcom/msm8937-camera.dtsi | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qcom/msm8937-camera.dtsi b/qcom/msm8937-camera.dtsi index 76bf8072..16120ab7 100644 --- a/qcom/msm8937-camera.dtsi +++ b/qcom/msm8937-camera.dtsi @@ -306,25 +306,22 @@ compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_iommu 0x400 0x00>, <&apps_iommu 0x2400 0x00>; + qcom,iommu-dma-addr-pool = <0x10000000 0x70000000>; label = "vfe"; qcom,scratch-buf-support; }; - msm_cam_smmu_cb2: msm_cam_smmu_cb2 { - compatible = "qcom,msm-cam-smmu-cb"; - label = "vfe_secure"; - qcom,secure-context; - }; - msm_cam_smmu_cb3: msm_cam_smmu_cb3 { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_iommu 0x1c00 0x00>; + qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>; label = "cpp"; }; msm_cam_smmu_cb4: msm_cam_smmu_cb4 { compatible = "qcom,msm-cam-smmu-cb"; iommus = <&apps_iommu 0x1800 0x00>; + qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>; label = "jpeg_enc0"; }; }; @@ -397,6 +394,8 @@ <106 512 0 0>; qcom,msm-bus-vector-dyn-vote; qcom,micro-reset; + qcom,src-clock-rates = <133333333 160000000 200000000 + 266666667 308570000 320000000 360000000>; qcom,cpp-fw-payload-info { qcom,stripe-base = <156>; qcom,plane-base = <141>; |