Skip to content

Commit d921928

Browse files
committed
QCLINUX: arm64: dts: qcom: Add camx overlay fixes for KLM
The following changes are backported from the 6.19 kernel into the 6.18.y stable branch. - Fix the indentation issue. - Update DT clock property name after clock. - Short DT nodes. - Fix indexing issue. - Update gpios shared pin. - Change the path for the camera firmware. - Enable imx577 sensor on lemans boards from slot0 to slot3. Signed-off-by: Chandan Kumar Jha <cjha@qti.qualcomm.com>
1 parent 31b0beb commit d921928

5 files changed

Lines changed: 514 additions & 143 deletions

File tree

arch/arm64/boot/dts/qcom/lemans-camera.dtsi

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@
667667
status = "ok";
668668
};
669669

670-
qcom,cam-cpas {
670+
cam_cpas: qcom,cam-cpas {
671671
compatible = "qcom,cam-cpas";
672672
label = "cpas";
673673
arch-compat = "cpas_top";
@@ -743,8 +743,7 @@
743743
"ife5", "ife6", "ipe0", "sfe0", "sfe1",
744744
"cam-cdm-intf0", "rt-cdm0", "rt-cdm1", "rt-cdm2",
745745
"rt-cdm3", "icp0", "tpg17", "tpg18", "tpg19";
746-
747-
enable-secure-qos-update;
746+
enable-secure-qos-update = <1>;
748747
cell-index = <0>;
749748
status = "ok";
750749

@@ -817,7 +816,6 @@
817816
parent-node = <&level1_rt_wr0>;
818817
};
819818

820-
821819
ife_1_wr_1: ife-1-wr-1 {
822820
cell-index = <4>;
823821
node-name = "ife-1-wr-1";
@@ -958,8 +956,7 @@
958956
node-name = "rt-cdm2-all-rd-2";
959957
client-name = "rt-cdm2";
960958
traffic-data = <CAM_CPAS_PATH_DATA_ALL>;
961-
traffic-transaction-type =
962-
<CAM_CPAS_TRANSACTION_READ>;
959+
traffic-transaction-type = <CAM_CPAS_TRANSACTION_READ>;
963960
parent-node = <&level1_nrt_rd2>;
964961
};
965962

@@ -1086,8 +1083,7 @@
10861083
level3_nrt0_rd_wr_sum: level3-nrt0-rd-wr-sum {
10871084
cell-index = <30>;
10881085
node-name = "level3-nrt0-rd-wr-sum";
1089-
traffic-merge-type =
1090-
<CAM_CPAS_TRAFFIC_MERGE_SUM>;
1086+
traffic-merge-type = <CAM_CPAS_TRAFFIC_MERGE_SUM>;
10911087

10921088
qcom,axi-port-mnoc {
10931089
cam-icc-path-names = "cam_sf_0";
@@ -1097,8 +1093,7 @@
10971093
level3_nrt1_rd_wr_sum: level3-nrt1-rd-wr-sum {
10981094
cell-index = <31>;
10991095
node-name = "level3-nrt1-rd-wr-sum";
1100-
traffic-merge-type =
1101-
<CAM_CPAS_TRAFFIC_MERGE_SUM>;
1096+
traffic-merge-type = <CAM_CPAS_TRAFFIC_MERGE_SUM>;
11021097

11031098
qcom,axi-port-mnoc {
11041099
cam-icc-path-names = "cam_sf_icp";
@@ -1108,8 +1103,7 @@
11081103
level3_rt_rd_wr_sum: level3-rt-rd-wr-sum {
11091104
cell-index = <32>;
11101105
node-name = "level3-rt-rd-wr-sum";
1111-
traffic-merge-type =
1112-
<CAM_CPAS_TRAFFIC_MERGE_SUM>;
1106+
traffic-merge-type = <CAM_CPAS_TRAFFIC_MERGE_SUM>;
11131107
ib-bw-voting-needed;
11141108

11151109
qcom,axi-port-mnoc {
@@ -1120,7 +1114,7 @@
11201114
};
11211115
};
11221116

1123-
qcom,cam-icp {
1117+
cam_icp_firmware: qcom,cam-icp {
11241118
compatible = "qcom,cam-icp";
11251119
compat-hw-name = "qcom,icp", "qcom,ipe0";
11261120
num-icp = <1>;
@@ -1148,8 +1142,8 @@
11481142
status = "ok";
11491143
};
11501144

1151-
qcom,cam-sync {
1152-
compatible = "qcom,cam-sync";
1145+
qcom,camera-main {
1146+
compatible = "qcom,camera";
11531147
status = "ok";
11541148
};
11551149

@@ -1274,8 +1268,8 @@
12741268
};
12751269
};
12761270

1277-
qcom,camera-main {
1278-
compatible = "qcom,camera";
1271+
qcom,cam-sync {
1272+
compatible = "qcom,cam-sync";
12791273
status = "ok";
12801274
};
12811275

@@ -1544,20 +1538,20 @@
15441538
interrupts = <GIC_SPI 604 IRQ_TYPE_EDGE_RISING>;
15451539
interrupt-names = "csid-lite4";
15461540
power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
1547-
clock-names = "cam_cc_cpas_ife_lite_clk",
1548-
"cam_cc_ife_lite_ahb_clk",
1549-
"cam_cc_ife_lite_csid_clk_src",
1550-
"cam_cc_ife_lite_csid_clk",
1551-
"cam_cc_ife_lite_cphy_rx_clk",
1552-
"cam_cc_ife_lite_clk_src",
1553-
"cam_cc_ife_lite_clk";
15541541
clocks = <&camcc CAM_CC_CPAS_IFE_LITE_CLK>,
15551542
<&camcc CAM_CC_IFE_LITE_AHB_CLK>,
15561543
<&camcc CAM_CC_IFE_LITE_CSID_CLK_SRC>,
15571544
<&camcc CAM_CC_IFE_LITE_CSID_CLK>,
15581545
<&camcc CAM_CC_IFE_LITE_CPHY_RX_CLK>,
15591546
<&camcc CAM_CC_IFE_LITE_CLK_SRC>,
15601547
<&camcc CAM_CC_IFE_LITE_CLK>;
1548+
clock-names = "cam_cc_cpas_ife_lite_clk",
1549+
"cam_cc_ife_lite_ahb_clk",
1550+
"cam_cc_ife_lite_csid_clk_src",
1551+
"cam_cc_ife_lite_csid_clk",
1552+
"cam_cc_ife_lite_cphy_rx_clk",
1553+
"cam_cc_ife_lite_clk_src",
1554+
"cam_cc_ife_lite_clk";
15611555
clock-rates = <0 0 400000000 0 0 400000000 0>,
15621556
<0 0 400000000 0 0 480000000 0>;
15631557
clock-cntl-level = "svs_l1", "nominal";
@@ -1606,7 +1600,7 @@
16061600
<400000000 0 600000000 0>;
16071601
clock-cntl-level = "svs_l1", "nominal";
16081602
nrt-device;
1609-
fw_name = "CAMERA_ICP";
1603+
fw_name = "qcom/sa8775p/CAMERA_ICP";
16101604
ubwc-ipe-fetch-cfg = <0x707b 0x7083>;
16111605
ubwc-ipe-write-cfg = <0x161ef 0x1620f>;
16121606
qos-val = <0xa0a>;
@@ -2000,7 +1994,6 @@
20001994
required-opps = <&rpmhpd_opp_nom>;
20011995
};
20021996
};
2003-
20041997
};
20051998

20061999
qcom,rt-cdm0 {
@@ -2140,12 +2133,12 @@
21402133
interrupts = <GIC_SPI 563 IRQ_TYPE_EDGE_RISING>;
21412134
interrupt-names = "sfe-lite0";
21422135
power-domains = <&camcc CAM_CC_TITAN_TOP_GDSC>;
2143-
clock-names = "cam_cc_sfe_lite_0_fast_ahb_clk",
2144-
"cam_cc_sfe_lite_0_clk",
2145-
"cam_cc_cpas_sfe_lite_0_clk";
21462136
clocks = <&camcc CAM_CC_SFE_LITE_0_FAST_AHB_CLK>,
21472137
<&camcc CAM_CC_SFE_LITE_0_CLK>,
21482138
<&camcc CAM_CC_CPAS_SFE_LITE_0_CLK>;
2139+
clock-names = "cam_cc_sfe_lite_0_fast_ahb_clk",
2140+
"cam_cc_sfe_lite_0_clk",
2141+
"cam_cc_cpas_sfe_lite_0_clk";
21492142
clock-rates = <0 480000000 300000000>,
21502143
<0 600000000 400000000>;
21512144
clock-cntl-level = "svs_l1", "nominal";

0 commit comments

Comments
 (0)