Skip to content

Commit a1cd8ac

Browse files
quic-vikramsaquic-vikramsa
committed
QCLINUX: arm64: dts: qcom: add camx overlay for talos evk
- Move all camx overlay to end of file to avoid conflicts. - Add camx overlay for talos evk. Signed-off-by: Vikram Sharma <vikramsa@qti.qualcomm.com>
1 parent bcf13dd commit a1cd8ac

5 files changed

Lines changed: 2210 additions & 32 deletions

File tree

‎arch/arm64/boot/dts/qcom/Makefile‎

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ lemans-evk-el2-dtbs := lemans-evk.dtb lemans-el2.dtbo
4040
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camera-csi1-imx577.dtb
4141
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-el2.dtb
4242

43-
lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo
44-
45-
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb
46-
4743
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk.dtb
4844

4945
monaco-evk-el2-dtbs := monaco-evk.dtb monaco-el2.dtbo
@@ -52,10 +48,6 @@ dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-el2.dtb
5248

5349
monaco-evk-camera-imx577-dtbs := monaco-evk.dtb monaco-evk-camera-imx577.dtbo
5450
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camera-imx577.dtb
55-
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
56-
57-
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
58-
5951
dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb
6052
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
6153
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
@@ -159,37 +151,21 @@ qcs6490-rb3gen2-industrial-mezzanine-dtbs := qcs6490-rb3gen2.dtb qcs6490-rb3gen2
159151
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-industrial-mezzanine.dtb
160152
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine.dtb
161153

162-
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
163-
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
164-
165-
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
166-
167154
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride.dtb
168155

169156
qcs8300-ride-el2-dtbs := qcs8300-ride.dtb monaco-el2.dtbo
170157

171158
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-el2.dtb
172159

173-
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
174-
175-
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
176-
177160
dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb
178161
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb
179162
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb
180163

181-
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
182164
qcs9100-ride-el2-dtbs := qcs9100-ride.dtb lemans-el2.dtbo
183165
qcs9100-ride-r3-el2-dtbs := qcs9100-ride-r3.dtb lemans-el2.dtbo
184166

185-
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
186-
187167
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb
188168

189-
qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo
190-
191-
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb
192-
193169
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-el2.dtb
194170
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-el2.dtb
195171
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
@@ -206,16 +182,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
206182
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
207183
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
208184

209-
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
210-
211-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
212-
213185
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3.dtb
214186

215-
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
216-
217-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
218-
219187
sc7180-acer-aspire1-el2-dtbs := sc7180-acer-aspire1.dtb sc7180-el2.dtbo
220188
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb sc7180-acer-aspire1-el2.dtb
221189
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
@@ -422,3 +390,44 @@ x1p42100-hp-omnibook-x14-el2-dtbs := x1p42100-hp-omnibook-x14.dtb x1-el2.dtbo
422390
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-hp-omnibook-x14.dtb x1p42100-hp-omnibook-x14-el2.dtb
423391
x1p42100-lenovo-thinkbook-16-el2-dtbs := x1p42100-lenovo-thinkbook-16.dtb x1-el2.dtbo
424392
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-lenovo-thinkbook-16.dtb x1p42100-lenovo-thinkbook-16-el2.dtb
393+
394+
lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo
395+
396+
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb
397+
398+
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
399+
400+
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
401+
402+
qcs615-ride-camx-dtbs := qcs615-ride.dtb qcs615-ride-camx.dtbo
403+
404+
dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride-camx.dtb
405+
406+
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
407+
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
408+
409+
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
410+
411+
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
412+
413+
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
414+
415+
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
416+
417+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
418+
419+
qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo
420+
421+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb
422+
423+
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
424+
425+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
426+
427+
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
428+
429+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
430+
431+
talos-evk-camx-dtbs := talos-evk.dtb talos-evk-camx.dtbo
432+
433+
dtb-$(CONFIG_ARCH_QCOM) += talos-evk-camx.dtb

‎arch/arm64/boot/dts/qcom/qcs615-ride-camx.dtso‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
*/
5+
6+
/dts-v1/;
7+
/plugin/;
8+
9+
#include <dt-bindings/clock/qcom,qcs615-gcc.h>
10+
#include <dt-bindings/clock/qcom,qcs615-camcc.h>
11+
#include <dt-bindings/interconnect/qcom,qcs615-rpmh.h>
12+
#include <dt-bindings/interrupt-controller/arm-gic.h>
13+
#include <dt-bindings/power/qcom-rpmpd.h>
14+
15+
#include "talos-camera.dtsi"
16+
#include "talos-camera-sensor.dtsi"

‎arch/arm64/boot/dts/qcom/talos-camera-sensor.dtsi‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
/*
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
*/
5+
6+
#include <dt-bindings/camera/msm-camera.h>
7+
8+
&cam_cci {
9+
/*cam0-imx577*/
10+
tl_slot0: qcom,cam-sensor0 {
11+
compatible = "qcom,cam-sensor";
12+
csiphy-sd-index = <0>;
13+
sensor-position-roll = <0>;
14+
sensor-position-pitch = <0>;
15+
sensor-position-yaw = <180>;
16+
eeprom-src = <&eeprom_cam0>;
17+
cam_vio-supply = <&vreg_s4a>;
18+
regulator-names = "cam_vio";
19+
power-domains = <&camcc TITAN_TOP_GDSC>;
20+
rgltr-cntrl-support;
21+
pwm-switch;
22+
rgltr-min-voltage = <1800000>;
23+
rgltr-max-voltage = <1800000>;
24+
rgltr-load-current = <120000>;
25+
gpio-no-mux = <0>;
26+
pinctrl-0 = <&cam_sensor_mclk3_active
27+
&cam_sensor_active_rst0>;
28+
pinctrl-1 = <&cam_sensor_mclk3_suspend
29+
&cam_sensor_suspend_rst0>;
30+
pinctrl-names = "cam_default", "cam_suspend";
31+
gpios = <&tlmm 28 0>,
32+
<&tlmm 75 0>;
33+
gpio-reset = <1>;
34+
gpio-req-tbl-num = <0 1>;
35+
gpio-req-tbl-flags = <1 0>;
36+
gpio-req-tbl-label = "CAM_MCLK0", "CAMIF_RESET0";
37+
cci-master = <0>;
38+
clocks = <&camcc CAM_CC_MCLK0_CLK>;
39+
clock-names = "cam_clk";
40+
clock-cntl-level = "nominal";
41+
clock-rates = <24000000>;
42+
cell-index = <0>;
43+
status = "okay";
44+
};
45+
46+
/*cam1-imx577*/
47+
t1_slot1: qcom,cam-sensor1 {
48+
compatible = "qcom,cam-sensor";
49+
csiphy-sd-index = <1>;
50+
sensor-position-roll = <0>;
51+
sensor-position-pitch = <0>;
52+
sensor-position-yaw = <180>;
53+
eeprom-src = <&eeprom_cam1>;
54+
cam_vio-supply = <&vreg_s4a>;
55+
regulator-names = "cam_vio";
56+
power-domains = <&camcc TITAN_TOP_GDSC>;
57+
rgltr-cntrl-support;
58+
pwm-switch;
59+
rgltr-min-voltage = <1800000>;
60+
rgltr-max-voltage = <1800000>;
61+
rgltr-load-current = <120000>;
62+
gpio-no-mux = <0>;
63+
pinctrl-0 = <&cam_sensor_mclk2_active
64+
&cam_sensor_active_rst1>;
65+
pinctrl-1 = <&cam_sensor_mclk2_suspend
66+
&cam_sensor_suspend_rst1>;
67+
gpios = <&tlmm 30 0>,
68+
<&tlmm 29 0>;
69+
gpio-reset = <1>;
70+
gpio-req-tbl-num = <0 1>;
71+
gpio-req-tbl-flags = <1 0>;
72+
gpio-req-tbl-label = "CAM_MCLK1", "CAMIF_RESET1";
73+
cci-master = <1>;
74+
clocks = <&camcc CAM_CC_MCLK1_CLK>;
75+
clock-names = "cam_clk";
76+
clock-cntl-level = "nominal";
77+
clock-rates = <24000000>;
78+
cell-index = <1>;
79+
status = "okay";
80+
};
81+
82+
/*cam0-imx577-eeprom*/
83+
eeprom_cam0: qcom,eeprom0 {
84+
compatible = "qcom,eeprom";
85+
cam_vio-supply = <&vreg_s4a>;
86+
regulator-names = "cam_vio";
87+
power-domains = <&camcc TITAN_TOP_GDSC>;
88+
rgltr-cntrl-support;
89+
pwm-switch;
90+
rgltr-min-voltage = <1800000>;
91+
rgltr-max-voltage = <1800000>;
92+
rgltr-load-current = <120000>;
93+
gpio-no-mux = <0>;
94+
pinctrl-0 = <&cam_sensor_mclk3_active
95+
&cam_sensor_active_rst0>;
96+
pinctrl-1 = <&cam_sensor_mclk3_suspend
97+
&cam_sensor_suspend_rst0>;
98+
pinctrl-names = "cam_default", "cam_suspend";
99+
gpios = <&tlmm 28 0>,
100+
<&tlmm 75 0>;
101+
gpio-reset = <1>;
102+
gpio-req-tbl-num = <0 1>;
103+
gpio-req-tbl-flags = <1 0>;
104+
gpio-req-tbl-label = "CAM_MCLK0", "CAMIF_RESET0";
105+
cci-master = <0>;
106+
clocks = <&camcc CAM_CC_MCLK0_CLK>;
107+
clock-names = "cam_clk";
108+
clock-cntl-level = "nominal";
109+
clock-rates = <24000000>;
110+
cell-index = <0>;
111+
status = "okay";
112+
};
113+
114+
/*cam1-imx577-eeprom*/
115+
eeprom_cam1: qcom,eeprom1 {
116+
compatible = "qcom,eeprom";
117+
cam_vio-supply = <&vreg_s4a>;
118+
regulator-names = "cam_vio";
119+
power-domains = <&camcc TITAN_TOP_GDSC>;
120+
rgltr-cntrl-support;
121+
pwm-switch;
122+
rgltr-min-voltage = <1800000>;
123+
rgltr-max-voltage = <1800000>;
124+
rgltr-load-current = <120000>;
125+
gpio-no-mux = <0>;
126+
pinctrl-0 = <&cam_sensor_mclk2_active
127+
&cam_sensor_active_rst1>;
128+
pinctrl-1 = <&cam_sensor_mclk2_suspend
129+
&cam_sensor_suspend_rst1>;
130+
pinctrl-names = "cam_default", "cam_suspend";
131+
gpios = <&tlmm 30 0>,
132+
<&tlmm 29 0>;
133+
gpio-reset = <1>;
134+
gpio-req-tbl-num = <0 1>;
135+
gpio-req-tbl-flags = <1 0>;
136+
gpio-req-tbl-label = "CAM_MCLK1", "CAMIF_RESET1";
137+
cci-master = <1>;
138+
clocks = <&camcc CAM_CC_MCLK1_CLK>;
139+
clock-names = "cam_clk";
140+
clock-cntl-level = "nominal";
141+
clock-rates = <24000000>;
142+
cell-index = <1>;
143+
status = "okay";
144+
};
145+
};
146+
147+
&soc {
148+
qcom,cam-res-mgr {
149+
compatible = "qcom,cam-res-mgr";
150+
status = "ok";
151+
};
152+
};

0 commit comments

Comments
 (0)