Merge 265b1558df on remote branch

Change-Id: Ic4828b61314552fae839939f2aa893b175dbefb4
This commit is contained in:
Linux Build Service Account 2021-08-13 00:44:18 -07:00
commit f268fda131
3 changed files with 20 additions and 3 deletions

View file

@ -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 = <GIC_SPI 210 IRQ_TYPE_EDGE_RISING>;
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 = <GIC_SPI 211 IRQ_TYPE_EDGE_RISING>;
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 = <GIC_SPI 212 IRQ_TYPE_EDGE_RISING>;
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 = <GIC_SPI 213 IRQ_TYPE_EDGE_RISING>;
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 = <GIC_SPI 77 IRQ_TYPE_EDGE_RISING>;
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 = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>;
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",

View file

@ -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>;

View file

@ -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 {