Skip to content

Commit f2d5dfa

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 ea0e80f commit f2d5dfa

2 files changed

Lines changed: 56 additions & 39 deletions

File tree

arch/arm64/boot/dts/qcom/Makefile

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,8 @@ lemans-evk-camera-dtbs := lemans-evk.dtb lemans-evk-camera.dtbo
3838
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camera-csi1-imx577.dtb
3939
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camera.dtb
4040

41-
lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo
42-
43-
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb
44-
4541
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk.dtb
4642

47-
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
48-
49-
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
50-
5143
dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb
5244
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
5345
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
@@ -141,9 +133,6 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb
141133
dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb
142134
dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride.dtb
143135

144-
qcs615-ride-camx-dtbs := qcs615-ride.dtb qcs615-ride-camx.dtbo
145-
dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride-camx.dtb
146-
147136
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-dragon-q6a.dtb
148137
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb
149138

@@ -153,30 +142,10 @@ qcs6490-rb3gen2-industrial-mezzanine-dtbs := qcs6490-rb3gen2.dtb qcs6490-rb3gen2
153142
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-industrial-mezzanine.dtb
154143
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine.dtb
155144

156-
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
157-
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
158-
159-
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
160-
161145
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride.dtb
162-
163-
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
164-
165-
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
166-
167146
dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb
168147
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb
169-
170-
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
171-
172-
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
173-
174148
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb
175-
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-
180149
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
181150
dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb
182151
dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb
@@ -191,16 +160,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
191160
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
192161
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
193162

194-
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
195-
196-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
197-
198163
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3.dtb
199164

200-
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
201-
202-
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
203-
204165
sc7180-acer-aspire1-el2-dtbs := sc7180-acer-aspire1.dtb sc7180-el2.dtbo
205166
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb sc7180-acer-aspire1-el2.dtb
206167
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
@@ -407,3 +368,43 @@ x1p42100-hp-omnibook-x14-el2-dtbs := x1p42100-hp-omnibook-x14.dtb x1-el2.dtbo
407368
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-hp-omnibook-x14.dtb x1p42100-hp-omnibook-x14-el2.dtb
408369
x1p42100-lenovo-thinkbook-16-el2-dtbs := x1p42100-lenovo-thinkbook-16.dtb x1-el2.dtbo
409370
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-lenovo-thinkbook-16.dtb x1p42100-lenovo-thinkbook-16-el2.dtb
371+
372+
lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo
373+
374+
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb
375+
376+
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo
377+
378+
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb
379+
380+
qcs615-ride-camx-dtbs := qcs615-ride.dtb qcs615-ride-camx.dtbo
381+
382+
dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride-camx.dtb
383+
384+
qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
385+
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo
386+
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb
387+
388+
qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo
389+
390+
dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb
391+
392+
qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
393+
394+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb
395+
396+
qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo
397+
398+
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb
399+
400+
sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo
401+
402+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb
403+
404+
sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo
405+
406+
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb
407+
408+
talos-evk-camx-dtbs := talos-evk.dtb talos-evk-camx.dtbo
409+
410+
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"

0 commit comments

Comments
 (0)