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/msm8917-camera.dtsi | |
| parent | 84ee10ed83c441b63b9ab3c0710351a7fba4fa14 (diff) | |
| parent | ac2071f00e6c3fc0207dc274c8a8cca46e4fe0bf (diff) | |
| download | devicetree-android-msm-barbet-4.19-s-qpr3-beta-3.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/msm8917-camera.dtsi')
| -rw-r--r-- | qcom/msm8917-camera.dtsi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/qcom/msm8917-camera.dtsi b/qcom/msm8917-camera.dtsi index b72cd436..4bd8513a 100644 --- a/qcom/msm8917-camera.dtsi +++ b/qcom/msm8917-camera.dtsi @@ -308,12 +308,6 @@ 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>; |