Skip to content

Commit 65ac677

Browse files
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 31b0beb commit 65ac677

3 files changed

Lines changed: 73 additions & 31 deletions

File tree

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,10 @@ 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-camera-imx577-dtbs := monaco-evk.dtb monaco-evk-camera-imx577.dtbo
5046
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camera-imx577.dtb
51-
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
52-
53-
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
5447

5548
dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb
5649
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
@@ -150,33 +143,17 @@ qcs6490-rb3gen2-industrial-mezzanine-dtbs := qcs6490-rb3gen2.dtb qcs6490-rb3gen2
150143
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-industrial-mezzanine.dtb
151144
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine.dtb
152145

153-
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
154-
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
155-
156-
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
157-
158146
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride.dtb
159147

160-
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
161-
162-
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
163-
164148
dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb
165149
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb
166150
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb
167151

168-
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
169152
qcs9100-ride-el2-dtbs := qcs9100-ride.dtb lemans-el2.dtbo
170153
qcs9100-ride-r3-el2-dtbs := qcs9100-ride-r3.dtb lemans-el2.dtbo
171154

172-
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
173-
174155
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb
175156

176-
qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo
177-
178-
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb
179-
180157
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-el2.dtb
181158
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-el2.dtb
182159
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
@@ -193,16 +170,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
193170
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
194171
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
195172

196-
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
197-
198-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
199-
200173
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3.dtb
201174

202-
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
203-
204-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
205-
206175
sc7180-acer-aspire1-el2-dtbs := sc7180-acer-aspire1.dtb sc7180-el2.dtbo
207176
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb sc7180-acer-aspire1-el2.dtb
208177
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
@@ -409,3 +378,44 @@ x1p42100-hp-omnibook-x14-el2-dtbs := x1p42100-hp-omnibook-x14.dtb x1-el2.dtbo
409378
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-hp-omnibook-x14.dtb x1p42100-hp-omnibook-x14-el2.dtb
410379
x1p42100-lenovo-thinkbook-16-el2-dtbs := x1p42100-lenovo-thinkbook-16.dtb x1-el2.dtbo
411380
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-lenovo-thinkbook-16.dtb x1p42100-lenovo-thinkbook-16-el2.dtb
381+
382+
lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo
383+
384+
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb
385+
386+
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
387+
388+
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
389+
390+
qcs615-ride-camx-dtbs := qcs615-ride.dtb qcs615-ride-camx.dtbo
391+
392+
dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride-camx.dtb
393+
394+
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
395+
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
396+
397+
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
398+
399+
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
400+
401+
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
402+
403+
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
404+
405+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
406+
407+
qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo
408+
409+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb
410+
411+
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
412+
413+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
414+
415+
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
416+
417+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
418+
419+
talos-evk-camx-dtbs := talos-evk.dtb talos-evk-camx.dtbo
420+
421+
dtb-$(CONFIG_ARCH_QCOM) += talos-evk-camx.dtb
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"
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"

0 commit comments

Comments
 (0)