diff options
| author | Srivatsa Vaddagiri <svaddagi@qti.qualcomm.com> | 2017-03-27 04:53:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-27 04:53:34 -0700 |
| commit | 1c6030169b95f24f5ed53ecba276107a6c0d5951 (patch) | |
| tree | 214844b45cb796db98d29732ac2a10232fb7c06c | |
| parent | f63246188b9ee5cff38e77bc951a3d15088b9649 (diff) | |
| parent | 93482a1df4ec03d916e241080d974a1981f8f3f4 (diff) | |
Merge "ARM: msm: dts: Add camera interrupts as bypass for msm8996" into dev/msm-4.4-8996au
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-pm.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-pm.dtsi b/arch/arm/boot/dts/qcom/msm8996-pm.dtsi index dbd87b4bae40..31ff7e7368c6 100644 --- a/arch/arm/boot/dts/qcom/msm8996-pm.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-pm.dtsi @@ -316,6 +316,7 @@ <0xff 94>, /* osmmu_CIrpt[0] */ <0xff 97>, /* iommu_nonsecure_irq */ <0xff 99>, /* msm_iommu_pmon_nonsecure_irq */ + <0xff 101>, /* camss_jpeg_mmu_cirpt */ <0xff 102>, /* osmmu_CIrpt[1] */ <0xff 105>, /* iommu_pmon_nonsecure_irq */ <0xff 108>, /* osmmu_PMIrpt */ @@ -391,6 +392,7 @@ <0xff 295>, /* camss_cpp_mmu_cirpt[0] */ <0xff 296>, /* camss_cpp_mmu_pmirpt */ <0xff 297>, /* ufs_intrq */ + <0xff 298>, /* camss_cpp_mmu_cirpt */ <0xff 302>, /* qdss_etrbytecnt_irq */ <0xff 310>, /* pcie20_1_int_pls_err */ <0xff 311>, /* pcie20_1_int_aer_legacy */ |