Skip to content

Add camx overlay for talos evk and ride #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quic-vikramsa wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+2,210 −31
Open

Add camx overlay for talos evk and ride #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 41 additions & 31 deletions arch/arm64/boot/dts/qcom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,10 @@ lemans-evk-el2-dtbs := lemans-evk.dtb lemans-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camera-csi1-imx577.dtb
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-el2.dtb

lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += monaco-evk.dtb

monaco-evk-camera-imx577-dtbs := monaco-evk.dtb monaco-evk-camera-imx577.dtbo
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camera-imx577.dtb
monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
Expand Down Expand Up @@ -150,33 +143,17 @@ qcs6490-rb3gen2-industrial-mezzanine-dtbs := qcs6490-rb3gen2.dtb qcs6490-rb3gen2
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-industrial-mezzanine.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine.dtb

qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride.dtb

qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb

qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo
qcs9100-ride-el2-dtbs := qcs9100-ride.dtb lemans-el2.dtbo
qcs9100-ride-r3-el2-dtbs := qcs9100-ride-r3.dtb lemans-el2.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.dtb

qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-el2.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-el2.dtb
dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb
Expand All @@ -193,16 +170,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb

sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb

dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3.dtb

sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb

sc7180-acer-aspire1-el2-dtbs := sc7180-acer-aspire1.dtb sc7180-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb sc7180-acer-aspire1-el2.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
Expand Down Expand Up @@ -409,3 +378,44 @@ x1p42100-hp-omnibook-x14-el2-dtbs := x1p42100-hp-omnibook-x14.dtb x1-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-hp-omnibook-x14.dtb x1p42100-hp-omnibook-x14-el2.dtb
x1p42100-lenovo-thinkbook-16-el2-dtbs := x1p42100-lenovo-thinkbook-16.dtb x1-el2.dtbo
dtb-$(CONFIG_ARCH_QCOM) += x1p42100-lenovo-thinkbook-16.dtb x1p42100-lenovo-thinkbook-16-el2.dtb

lemans-evk-camx-dtbs := lemans-evk.dtb lemans-evk-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-camx.dtb

monaco-evk-camx-dtbs := monaco-evk.dtb monaco-evk-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += monaco-evk-camx.dtb

qcs615-ride-camx-dtbs := qcs615-ride.dtb qcs615-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs615-ride-camx.dtb

qcs6490-rb3gen2-vision-mezzanine-camx-dtbs := qcs6490-rb3gen2-vision-mezzanine.dtb \
qcs6490-rb3gen2-vision-mezzanine-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2-vision-mezzanine-camx.dtb

qcs8300-ride-camx-dtbs:= qcs8300-ride.dtb qcs8300-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs8300-ride-camx.dtb

qcs9100-ride-camx-dtbs:= qcs9100-ride.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-camx.dtb

qcs9100-ride-r3-camx-dtbs:= qcs9100-ride-r3.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3-camx.dtb

sa8775p-ride-camx-dtbs:= sa8775p-ride.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-camx.dtb

sa8775p-ride-r3-camx-dtbs:= sa8775p-ride-r3.dtb sa8775p-ride-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride-r3-camx.dtb

talos-evk-camx-dtbs := talos-evk.dtb talos-evk-camx.dtbo

dtb-$(CONFIG_ARCH_QCOM) += talos-evk-camx.dtb
16 changes: 16 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs615-ride-camx.dtso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/

/dts-v1/;
/plugin/;

#include <dt-bindings/clock/qcom,qcs615-gcc.h>
#include <dt-bindings/clock/qcom,qcs615-camcc.h>
#include <dt-bindings/interconnect/qcom,qcs615-rpmh.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/qcom-rpmpd.h>

#include "talos-camera.dtsi"
#include "talos-camera-sensor.dtsi"
152 changes: 152 additions & 0 deletions arch/arm64/boot/dts/qcom/talos-camera-sensor.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/

#include <dt-bindings/camera/msm-camera.h>

&cam_cci {
/*cam0-imx577*/
tl_slot0: qcom,cam-sensor0 {
compatible = "qcom,cam-sensor";
csiphy-sd-index = <0>;
sensor-position-roll = <0>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_cam0>;
cam_vio-supply = <&vreg_s4a>;
regulator-names = "cam_vio";
power-domains = <&camcc TITAN_TOP_GDSC>;
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000>;
rgltr-max-voltage = <1800000>;
rgltr-load-current = <120000>;
gpio-no-mux = <0>;
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_active_rst0>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_suspend_rst0>;
pinctrl-names = "cam_default", "cam_suspend";
gpios = <&tlmm 28 0>,
<&tlmm 75 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAM_MCLK0", "CAMIF_RESET0";
cci-master = <0>;
clocks = <&camcc CAM_CC_MCLK0_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
cell-index = <0>;
status = "okay";
};

/*cam1-imx577*/
t1_slot1: qcom,cam-sensor1 {
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <0>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_cam1>;
cam_vio-supply = <&vreg_s4a>;
regulator-names = "cam_vio";
power-domains = <&camcc TITAN_TOP_GDSC>;
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000>;
rgltr-max-voltage = <1800000>;
rgltr-load-current = <120000>;
gpio-no-mux = <0>;
pinctrl-0 = <&cam_sensor_mclk2_active
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_suspend_rst1>;
gpios = <&tlmm 30 0>,
<&tlmm 29 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAM_MCLK1", "CAMIF_RESET1";
cci-master = <1>;
clocks = <&camcc CAM_CC_MCLK1_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
cell-index = <1>;
status = "okay";
};

/*cam0-imx577-eeprom*/
eeprom_cam0: qcom,eeprom0 {
compatible = "qcom,eeprom";
cam_vio-supply = <&vreg_s4a>;
regulator-names = "cam_vio";
power-domains = <&camcc TITAN_TOP_GDSC>;
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000>;
rgltr-max-voltage = <1800000>;
rgltr-load-current = <120000>;
gpio-no-mux = <0>;
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_active_rst0>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_suspend_rst0>;
pinctrl-names = "cam_default", "cam_suspend";
gpios = <&tlmm 28 0>,
<&tlmm 75 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAM_MCLK0", "CAMIF_RESET0";
cci-master = <0>;
clocks = <&camcc CAM_CC_MCLK0_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
cell-index = <0>;
status = "okay";
};

/*cam1-imx577-eeprom*/
eeprom_cam1: qcom,eeprom1 {
compatible = "qcom,eeprom";
cam_vio-supply = <&vreg_s4a>;
regulator-names = "cam_vio";
power-domains = <&camcc TITAN_TOP_GDSC>;
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000>;
rgltr-max-voltage = <1800000>;
rgltr-load-current = <120000>;
gpio-no-mux = <0>;
pinctrl-0 = <&cam_sensor_mclk2_active
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_suspend_rst1>;
pinctrl-names = "cam_default", "cam_suspend";
gpios = <&tlmm 30 0>,
<&tlmm 29 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAM_MCLK1", "CAMIF_RESET1";
cci-master = <1>;
clocks = <&camcc CAM_CC_MCLK1_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
cell-index = <1>;
status = "okay";
};
};

&soc {
qcom,cam-res-mgr {
compatible = "qcom,cam-res-mgr";
status = "ok";
};
};
Loading