Merge 408da67175 on remote branch

Change-Id: I524f5eddeb8e3c24c079046f4bb6cee33e528b00
This commit is contained in:
Linux Build Service Account
2024-12-13 12:15:43 -08:00
8 changed files with 3087 additions and 0 deletions

View File

@@ -9,3 +9,9 @@ dtbo-$(CONFIG_ARCH_TUNA) += tuna-camera.dtbo
dtbo-$(CONFIG_ARCH_TUNA) += tuna-camera-sensor-mtp.dtbo \
tuna-camera-sensor-cdp.dtbo \
tuna-camera-sensor-qrd.dtbo
dtbo-$(CONFIG_ARCH_KERA) += kera-camera.dtbo
dtbo-$(CONFIG_ARCH_KERA) += kera-camera-sensor-mtp.dtbo \
kera-camera-sensor-cdp.dtbo \
kera-camera-sensor-qrd.dtbo \
kera-camera-sensor-rcm.dtbo

View File

@@ -0,0 +1,23 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/clock/qcom,camcc-sun.h>
#include <dt-bindings/clock/qcom,cambistmclkcc-sun.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "kera-camera-sensor-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kera CDP";
compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
"qcom,cdp";
qcom,msm-id = <686 0x10000>, <686 0x20000>, <659 0x10000>, <659 0x20000>;
qcom,board-id = <0x10001 0>, <0x20001 0>, <0x30001 0>, <0x40001 0>;
};

View File

@@ -0,0 +1,24 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/clock/qcom,camcc-sun.h>
#include <dt-bindings/clock/qcom,cambistmclkcc-sun.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "kera-camera-sensor-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kera MTP";
compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
"qcom,mtp";
qcom,msm-id = <686 0x10000>, <686 0x20000>, <659 0x10000>, <659 0x20000>;
qcom,board-id = <0x10008 0>, <0x10008 1>, <0x20008 0>, <0x20008 1>,
<0x30008 0>, <0x30008 1>;
};

418
kera-camera-sensor-mtp.dtsi Normal file
View File

@@ -0,0 +1,418 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <dt-bindings/msm-camera.h>
&soc {
led_flash_triple_rear_wide: qcom,camera-flash1 {
cell-index = <1>;
compatible = "qcom,camera-flash";
flash-source = <&pmxr2230_flash0 &pmxr2230_flash1>;
torch-source = <&pmxr2230_torch0 &pmxr2230_torch1>;
switch-source = <&pmxr2230_switch2>;
status = "ok";
};
led_flash_triple_rear_tele: qcom,camera-flash2 {
cell-index = <2>;
compatible = "qcom,camera-flash";
flash-source = <&pmxr2230_flash0 &pmxr2230_flash1>;
torch-source = <&pmxr2230_torch0 &pmxr2230_torch1>;
switch-source = <&pmxr2230_switch2>;
status = "ok";
};
led_flash_triple_rear_ultrawide: qcom,camera-flash3 {
cell-index = <3>;
compatible = "qcom,camera-flash";
flash-source = <&pmxr2230_flash0 &pmxr2230_flash1>;
torch-source = <&pmxr2230_torch0 &pmxr2230_torch1>;
switch-source = <&pmxr2230_switch2>;
status = "ok";
};
qcom,cam-res-mgr {
compatible = "qcom,cam-res-mgr";
status = "ok";
};
};
&cam_cci0 {
actuator_triple_wide: qcom,actuator2 {
cell-index = <2>;
compatible = "qcom,actuator";
cci-master = <CCI_MASTER_1>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <2800000>;
rgltr-max-voltage = <3000000>;
rgltr-load-current = <103000>;
status = "ok";
};
/* Actuator (UW) */
actuator_triple_uw: qcom,actuator1 {
cell-index = <1>;
compatible = "qcom,actuator";
cci-master = <CCI_MASTER_0>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <2800000>;
rgltr-max-voltage = <3000000>;
rgltr-load-current = <103000>;
status = "ok";
};
/* OIS (W) */
ois_wide: qcom,ois0 {
cell-index = <2>;
compatible = "qcom,ois";
cci-master = <CCI_MASTER_1>;
cam_vio-supply = <&L5N>;
cam_vaf-supply = <&L7M>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
regulator-names = "cam_vio","cam_vaf", "cam_clk";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 2800000 0>;
rgltr-max-voltage = <1980000 3000000 0>;
rgltr-load-current = <3500 214290 0>;
status = "ok";
};
/* EEPROM (W) */
eeprom_wide: qcom,eeprom2 {
cell-index = <2>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L1N>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L6M>;
cam_vaf-supply = <&L7M>;
cam_v_custom1-supply = <&L3N>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana",
"cam_vaf", "cam_v_custom1";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1104000 0 2800000 2800000 1800000>;
rgltr-max-voltage = <1980000 1200000 0 2900000 3000000 1900000>;
rgltr-load-current = <3500 913200 0 91430 103000 63100>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_suspend_rst1>;
gpios = <&tlmm 66 0>,
<&tlmm 124 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK1",
"CAM_RESET1";
cci-master = <CCI_MASTER_1>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK1_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* EEPROM (UW) */
eeprom_uw: qcom,eeprom1 {
cell-index = <1>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L1M>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L3M>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana",
"cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1100000 0 2800000 2800000>;
rgltr-max-voltage = <1980000 1200000 0 2900000 3000000>;
rgltr-load-current = <3500 522730 0 107140 103000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active
&cam_sensor_active_rst0>;
pinctrl-1 = <&cam_sensor_mclk0_suspend
&cam_sensor_suspend_rst0>;
gpios = <&tlmm 65 0>,
<&tlmm 123 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0";
cci-master = <CCI_MASTER_0>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* IMX858 (UWide) */
qcom,cam-sensor1 {
cell-index = <1>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <0>;
sensor-position-roll = <90>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_uw>;
actuator-src = <&actuator_triple_uw>;
led-flash-src = <&led_flash_triple_rear_ultrawide>;
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L1M>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L3M>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana",
"cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1100000 0 2800000 2800000>;
rgltr-max-voltage = <1980000 1200000 0 2900000 3000000>;
rgltr-load-current = <3500 522730 0 107140 103000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active
&cam_sensor_active_rst0>;
pinctrl-1 = <&cam_sensor_mclk0_suspend
&cam_sensor_suspend_rst0>;
gpios = <&tlmm 65 0>,
<&tlmm 123 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0";
cci-master = <CCI_MASTER_0>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* IMX766 + OIS (Wide) */
qcom,cam-sensor2 {
cell-index = <2>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <90>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_wide>;
ois-src = <&ois_wide>;
actuator-src = <&actuator_triple_wide>;
led-flash-src = <&led_flash_triple_rear_wide>;
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L1N>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L6M>;
cam_vaf-supply = <&L7M>;
cam_v_custom1-supply = <&L3N>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana",
"cam_vaf", "cam_v_custom1";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1104000 0 2800000 2800000 1800000>;
rgltr-max-voltage = <1980000 1200000 0 2900000 3000000 1900000>;
rgltr-load-current = <3500 913200 0 91430 103000 63100>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_suspend_rst1>;
gpios = <&tlmm 66 0>,
<&tlmm 124 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK1",
"CAM_RESET1";
cci-master = <CCI_MASTER_1>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK1_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
};
&cam_cci1 {
/* Actuator (Tele) */
actuator_triple_tele: qcom,actuator3 {
cell-index = <3>;
compatible = "qcom,actuator";
cci-master = <CCI_MASTER_0>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <2800000>;
rgltr-max-voltage = <3000000>;
rgltr-load-current = <130000>;
status = "ok";
};
/* EEPROM (Tele) */
eeprom_tele: qcom,eeprom3 {
cell-index = <3>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L2M>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L4M>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk",
"cam_vana", "cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1056000 0 2800000 2800000>;
rgltr-max-voltage = <1980000 1150000 0 2900000 3000000>;
rgltr-load-current = <4000 261000 0 68000 130000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active
&cam_sensor_active_rst2>;
pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_suspend_rst2>;
gpios = <&tlmm 67 0>,
<&tlmm 125 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2";
cci-master = <CCI_MASTER_0>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* EEPROM (Front) */
eeprom_front: qcom,eeprom4 {
cell-index = <4>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L2N>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L6N>;
cam_v_custom1-supply = <&L4N>;
regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana",
"cam_v_custom1";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>;
rgltr-max-voltage = <1980000 1150000 0 2900000 1900000>;
rgltr-load-current = <5000 453330 0 77500 28890>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_active_rst3>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_suspend_rst3>;
gpios = <&tlmm 68 0>,
<&tlmm 126 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK3",
"CAM_RESET3";
cci-master = <CCI_MASTER_1>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK3_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* IMX688 (Front) */
qcom,cam-sensor4 {
cell-index = <4>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <3>;
sensor-position-roll = <90>;
sensor-position-pitch = <0>;
sensor-position-yaw = <0>;
eeprom-src = <&eeprom_front>;
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L2N>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L6N>;
cam_v_custom1-supply = <&L4N>;
regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana",
"cam_v_custom1";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>;
rgltr-max-voltage = <1980000 1150000 0 2900000 1900000>;
rgltr-load-current = <5000 453330 0 77500 28890>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_active_rst3>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_suspend_rst3>;
gpios = <&tlmm 68 0>,
<&tlmm 126 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK3",
"CAM_RESET3";
cci-master = <CCI_MASTER_1>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK3_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
/* JN1 (Tele) */
qcom,cam-sensor3 {
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <90>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
eeprom-src = <&eeprom_tele>;
actuator-src = <&actuator_triple_tele>;
led-flash-src = <&led_flash_triple_rear_tele>;
cam_vio-supply = <&L5N>;
cam_vdig-supply = <&L2M>;
cam_clk-supply = <&cam_cc_titan_top_gdsc>;
cam_vana-supply = <&L4M>;
cam_vaf-supply = <&L7M>;
regulator-names = "cam_vio", "cam_vdig", "cam_clk",
"cam_vana", "cam_vaf";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 1056000 0 2800000 2800000>;
rgltr-max-voltage = <1980000 1150000 0 2900000 3000000>;
rgltr-load-current = <4000 261000 0 68000 130000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active
&cam_sensor_active_rst2>;
pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_suspend_rst2>;
gpios = <&tlmm 67 0>,
<&tlmm 125 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2";
cci-master = <CCI_MASTER_0>;
clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>;
clock-names = "cam_clk";
clock-cntl-level = "nominal";
clock-rates = <24000000>;
status = "ok";
};
};

View File

@@ -0,0 +1,23 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/clock/qcom,camcc-sun.h>
#include <dt-bindings/clock/qcom,cambistmclkcc-sun.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "kera-camera-sensor-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kera QRD";
compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
"qcom,qrd";
qcom,msm-id = <686 0x10000>, <686 0x20000>, <659 0x10000>, <659 0x20000>;
qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>;
};

View File

@@ -0,0 +1,24 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/clock/qcom,camcc-sun.h>
#include <dt-bindings/clock/qcom,cambistmclkcc-sun.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "kera-camera-sensor-mtp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kera RCM";
compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
"qcom,rcm";
qcom,msm-id = <686 0x10000>, <686 0x20000>, <659 0x10000>, <659 0x20000>;
qcom,board-id = <0x10015 0>, <0x20015 0>, <0x30015 0>, <0x10015 1>,
<0x20015 1>, <0x30015 1>;
};

21
kera-camera.dts Normal file
View File

@@ -0,0 +1,21 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
/plugin/;
#include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/clock/qcom,camcc-sun.h>
#include <dt-bindings/interconnect/qcom,kera.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "kera-camera.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Kera SoC";
compatible = "qcom,kera";
qcom,msm-id = <686 0x10000>, <686 0x20000>, <659 0x10000>, <659 0x20000>;
qcom,board-id = <0 0>;
};

2548
kera-camera.dtsi Normal file

File diff suppressed because it is too large Load Diff