From 9d5808326fb4aee7766f6cb5e02af844d4c0cdd2 Mon Sep 17 00:00:00 2001 From: Vishal Verma Date: Fri, 9 Jul 2021 20:23:12 +0530 Subject: [PATCH 1/3] ARM: dts: msm: Correct the PHY index for TPG nodes update csiphy index in tpg dt node to fix max csiphy index issue. CRs-Fixed: 2990938 Change-Id: Ia2856441b218ad291b09ef0dd8415793eff09d7b --- holi-camera-sensor-mtp.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/holi-camera-sensor-mtp.dtsi b/holi-camera-sensor-mtp.dtsi index 39c9f5cdbdc2..eb919029cb2d 100644 --- a/holi-camera-sensor-mtp.dtsi +++ b/holi-camera-sensor-mtp.dtsi @@ -212,7 +212,7 @@ qcom,cam-tpg0 { cell-index = <4>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <4>; + csiphy-sd-index = <0>; sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; @@ -235,7 +235,7 @@ qcom,cam-tpg1 { cell-index = <5>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <5>; + csiphy-sd-index = <1>; sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; @@ -258,7 +258,7 @@ qcom,cam-tpg2 { cell-index = <6>; compatible = "qcom,cam-sensor"; - csiphy-sd-index = <6>; + csiphy-sd-index = <2>; sensor-position-roll = <270>; sensor-position-pitch = <0>; sensor-position-yaw = <180>; From f955f9553530b4962898d6b405b08f63fc7724a2 Mon Sep 17 00:00:00 2001 From: Shravya Samala Date: Mon, 10 May 2021 17:38:16 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Control stall disable Camera and display shares same SMMU context bank. Set stall disable from DTSI to prevent device crash from display. CRs-Fixed: 2936331 Change-Id: Id4bc9e4aefc9b6a0d7fd11885a196c04fdda50dc --- yupik-camera.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yupik-camera.dtsi b/yupik-camera.dtsi index beb11cfba3da..78f16afcd37d 100644 --- a/yupik-camera.dtsi +++ b/yupik-camera.dtsi @@ -393,6 +393,7 @@ qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>; dma-coherent-hint-cached; cam-smmu-label = "ife"; + stall-disable; multiple-client-devices; ife_iova_mem_map: iova-mem-map { /* IO region is approximately 4 GB */ @@ -412,6 +413,7 @@ <&apps_smmu 0x20E0 0x20>; cam-smmu-label = "jpeg"; qcom,iommu-faults = "non-fatal"; + stall-disable; qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>; dma-coherent-hint-cached; jpeg_iova_mem_map: iova-mem-map { @@ -442,6 +444,7 @@ <&apps_smmu 0x2140 0x0>; cam-smmu-label = "icp"; qcom,iommu-faults = "non-fatal"; + stall-disable; qcom,iommu-dma-addr-pool = <0x10c00000 0xee300000>; dma-coherent-hint-cached; iova-region-discard = <0xdff00000 0x300000>; @@ -500,6 +503,7 @@ iommus = <&apps_smmu 0x2040 0x0>; cam-smmu-label = "cpas-cdm"; qcom,iommu-faults = "non-fatal"; + stall-disable; qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>; dma-coherent-hint-cached; cpas_cdm_iova_mem_map: iova-mem-map { @@ -526,6 +530,7 @@ <&apps_smmu 0x2120 0x20>; cam-smmu-label = "lrme"; qcom,iommu-faults = "non-fatal"; + stall-disable; qcom,iommu-dma-addr-pool = <0x100000 0xffe00000>; dma-coherent-hint-cached; lrme_iova_mem_map: iova-mem-map { From 923fd239daddc1b5590a47cbd23a426d5f11cfdb Mon Sep 17 00:00:00 2001 From: Ayush Kumar Date: Mon, 21 Jun 2021 17:50:48 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Add cx-ipeak support from Blair Camera This change is to add cx-ipeak support from blair camera. CRs-Fixed: 2944976 Change-Id: I5628bcae9ac75d9b7a36d15a14ab5ee23ef8dec1 --- blair-camera.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/blair-camera.dtsi b/blair-camera.dtsi index f2537858db28..865690b33507 100644 --- a/blair-camera.dtsi +++ b/blair-camera.dtsi @@ -23,6 +23,7 @@ rgltr-min-voltage = <0 880000 1200000>; rgltr-max-voltage = <0 1050000 1300000>; rgltr-load-current = <0 16200 9000>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, <&gcc GCC_CAMSS_CPHY_0_CLK>, <&gcc GCC_CAMSS_CSI0PHYTIMER_CLK_SRC>, @@ -58,6 +59,7 @@ rgltr-min-voltage = <0 880000 1200000>; rgltr-max-voltage = <0 1050000 1300000>; rgltr-load-current = <0 16200 9000>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, <&gcc GCC_CAMSS_CPHY_1_CLK>, <&gcc GCC_CAMSS_CSI1PHYTIMER_CLK_SRC>, @@ -93,6 +95,7 @@ rgltr-min-voltage = <0 880000 1200000>; rgltr-max-voltage = <0 1050000 1300000>; rgltr-load-current = <0 16200 9000>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, <&gcc GCC_CAMSS_CPHY_2_CLK>, <&gcc GCC_CAMSS_CSI2PHYTIMER_CLK_SRC>, @@ -128,6 +131,7 @@ rgltr-min-voltage = <0 880000 1200000>; rgltr-max-voltage = <0 1050000 1300000>; rgltr-load-current = <0 16200 9000>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clocks = <&gcc GCC_CAMSS_TFE_CPHY_RX_CLK_SRC>, <&gcc GCC_CAMSS_CPHY_3_CLK>, <&gcc GCC_CAMSS_CSI3PHYTIMER_CLK_SRC>, @@ -413,6 +417,7 @@ camnoc-axi-min-ib-bw = <3000000000>; regulator-names = "camss-vdd"; camss-vdd-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "gcc_camss_ahb_clk", "gcc_camss_top_ahb_clk", @@ -709,6 +714,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_csid_clk_src", "tfe_csid_clk", @@ -744,6 +750,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_clk_src", "tfe_clk"; @@ -773,6 +780,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_csid_clk_src", "tfe_csid_clk", @@ -808,6 +816,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_clk_src", "tfe_clk"; @@ -837,6 +846,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_csid_clk_src", "tfe_csid_clk", @@ -872,6 +882,7 @@ interrupts = ; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "tfe_clk_src", "tfe_clk"; @@ -1032,6 +1043,7 @@ interrupt-names = "ope"; regulator-names = "camss"; camss-supply = <&gcc_camss_top_gdsc>; + qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; clock-names = "ope_ahb_clk_src", "ope_ahb_clk",