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/qm215-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/qm215-camera.dtsi')
-rw-r--r-- | qcom/qm215-camera.dtsi | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/qcom/qm215-camera.dtsi b/qcom/qm215-camera.dtsi index aad0017e..9169b3b8 100644 --- a/qcom/qm215-camera.dtsi +++ b/qcom/qm215-camera.dtsi @@ -15,7 +15,7 @@ reg = <0x1b34000 0x1000>, <0x1b00030 0x4>; reg-names = "csiphy", "csiphy_clk_mux"; - interrupts = <0 78 0>; + interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "csiphy"; clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>, <&gcc GCC_CAMSS_ISPIF_AHB_CLK>, @@ -38,7 +38,7 @@ reg = <0x1b35000 0x1000>, <0x1b00038 0x4>; reg-names = "csiphy", "csiphy_clk_mux"; - interrupts = <0 79 0>; + interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "csiphy"; clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>, <&gcc GCC_CAMSS_ISPIF_AHB_CLK>, @@ -60,7 +60,7 @@ compatible = "qcom,csid-v3.4.3", "qcom,csid"; reg = <0x1b30000 0x400>; reg-names = "csid"; - interrupts = <0 51 0>; + interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "csid"; qcom,csi-vdd-voltage = <1088000>; qcom,mipi-csi-vdd-supply = <&pm8916_l2>; @@ -304,25 +304,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"; }; }; @@ -395,6 +392,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>; |