From 2d64152f073c74830fdcdb4dd2dec7000d3b8b92 Mon Sep 17 00:00:00 2001 From: Mukund Deshmukh Date: Tue, 3 Dec 2024 10:15:34 +0530 Subject: [PATCH 1/4] ARM: dts: msm: Updation of RST2 config parameters RS2 configuration updation with removal of apps and remote attributes. CRs-Fixed: 3989900. Change-Id: I2b5dc440e1e8979f3e83a7914b6c82f425e8779d --- kera-camera.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 790ff951..44b6cee8 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -411,7 +411,6 @@ pins = "gpio125"; bias-disable; /* No PULL */ drive-strength = <2>; /* 2 MA */ - qcom,apps; }; }; @@ -426,7 +425,6 @@ bias-pull-down; /* PULL DOWN */ drive-strength = <2>; /* 2 MA */ output-low; - qcom,remote; }; }; From 6276bd54898837ff1d5e837b032d679e8c386067 Mon Sep 17 00:00:00 2001 From: Pengfei Liu Date: Thu, 21 Nov 2024 15:35:02 +0800 Subject: [PATCH 2/4] ARM: dts: msm: hdk rotate 180 degree for rear camera - HDK roll 180 degree compare to mtp/qrd. - Change dtsi roll degree of hdk. CRs-Fixed: 3979998 Change-Id: I2f067dcf135443a04881257f840bf2ee87298473 Signed-off-by: Pengfei Liu --- config/sun.mk | 1 + sun-camera-sensor-hdk.dts | 24 ++ sun-camera-sensor-hdk.dtsi | 782 +++++++++++++++++++++++++++++++++++++ sun-camera-sensor-qrd.dts | 2 +- 4 files changed, 808 insertions(+), 1 deletion(-) create mode 100644 sun-camera-sensor-hdk.dts create mode 100644 sun-camera-sensor-hdk.dtsi diff --git a/config/sun.mk b/config/sun.mk index 43a8a45f..022fef7e 100644 --- a/config/sun.mk +++ b/config/sun.mk @@ -2,6 +2,7 @@ dtbo-$(CONFIG_ARCH_SUN) := sun-camera.dtbo dtbo-$(CONFIG_ARCH_SUN) += sun-camera-sensor-mtp.dtbo \ sun-camera-sensor-rumi.dtbo \ sun-camera-sensor-cdp.dtbo \ + sun-camera-sensor-hdk.dtbo \ sun-camera-sensor-qrd.dtbo dtbo-$(CONFIG_ARCH_TUNA) += tuna-camera.dtbo diff --git a/sun-camera-sensor-hdk.dts b/sun-camera-sensor-hdk.dts new file mode 100644 index 00000000..2baad661 --- /dev/null +++ b/sun-camera-sensor-hdk.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include +#include +#include +#include +#include +#include + +#include "sun-camera-sensor-hdk.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Sun QRD"; + compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,board-id = <0x1001F 0>; +}; diff --git a/sun-camera-sensor-hdk.dtsi b/sun-camera-sensor-hdk.dtsi new file mode 100644 index 00000000..76fa011a --- /dev/null +++ b/sun-camera-sensor-hdk.dtsi @@ -0,0 +1,782 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +&soc { + led_flash_triple_rear_wide: qcom,camera-flash1 { + cell-index = <1>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8550_flash0 &pm8550_flash1>; + torch-source = <&pm8550_torch0 &pm8550_torch1>; + switch-source = <&pm8550_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_tele: qcom,camera-flash2 { + cell-index = <2>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8550_flash0 &pm8550_flash1>; + torch-source = <&pm8550_torch0 &pm8550_torch1>; + switch-source = <&pm8550_switch2>; + status = "ok"; + }; + + led_flash_triple_rear_ultrawide: qcom,camera-flash3 { + cell-index = <3>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8550_flash0 &pm8550_flash1>; + torch-source = <&pm8550_torch0 &pm8550_torch1>; + switch-source = <&pm8550_switch2>; + status = "ok"; + }; + + led_flash_asc_rear: qcom,camera-flash4 { + cell-index = <4>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8550_flash0 &pm8550_flash1>; + torch-source = <&pm8550_torch0 &pm8550_torch1>; + switch-source = <&pm8550_switch2>; + status = "ok"; + }; + + led_flash_rear_aux: qcom,camera-flash5 { + cell-index = <5>; + compatible = "qcom,camera-flash"; + flash-source = <&pm8550_flash0 &pm8550_flash1>; + torch-source = <&pm8550_torch0 &pm8550_torch1>; + switch-source = <&pm8550_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 = ; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2960000>; + rgltr-max-voltage = <2960000>; + rgltr-load-current = <119000>; + status = "ok"; + }; + + actuator_rear_aux: qcom,actuator8 { + cell-index = <8>; + compatible = "qcom,actuator"; + cci-master = ; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2960000>; + rgltr-max-voltage = <2960000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + ois_wide: qcom,ois0 { + cell-index = <2>; + compatible = "qcom,ois"; + cci-master = ; + cam_vio-supply = <&L5M>; + 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 2960000 0>; + rgltr-max-voltage = <1800000 2960000 0>; + rgltr-load-current = <4000 220000 0>; + status = "ok"; + }; + + eeprom_tof1: qcom,eeprom7 { + cell-index = <7>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&S7I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L5N>; + cam_v_custom1-supply = <&L7N>; + cam_v_custom2-supply = <&DBO3>; + regulator-names = "cam_vio", "cam_vdig", + "cam_clk", "cam_vana", "cam_v_custom1", "cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1256000 0 2800000 3304000 3600000>; + rgltr-max-voltage = <1800000 1340000 0 2800000 3304000 3600000>; + rgltr-load-current = <155000 680000 0 50000 30000 2500000>; + 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 89 0>, + <&tlmm 13 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + eeprom_rear_aux: qcom,eeprom8 { + cell-index = <8>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&L1N>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L3M>; + cam_vaf-supply = <&L7M>; + cam_v_custom1-supply = <&L6M>; + 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 2960000 2800000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 2960000 2800000>; + rgltr-load-current = <6400 850000 0 114500 100000 140000>; + 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 89 0>, + <&tlmm 13 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + eeprom_wide: qcom,eeprom2 { + cell-index = <2>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L5M>; + 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 2960000 1800000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 2960000 1800000>; + rgltr-load-current = <4000 913000 0 91400 119000 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 90 0>, + <&tlmm 15 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor7 { + cell-index = <7>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + eeprom-src = <&eeprom_tof1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&S7I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L5N>; + cam_v_custom1-supply = <&L7N>; + cam_v_custom2-supply = <&DBO3>; + regulator-names = "cam_vio", "cam_vdig", + "cam_clk", "cam_vana", "cam_v_custom1", "cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1256000 0 2800000 3304000 3600000>; + rgltr-max-voltage = <1800000 1340000 0 2800000 3304000 3600000>; + rgltr-load-current = <155000 680000 0 50000 30000 2500000>; + 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 89 0>, + <&tlmm 13 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor2 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + 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 = <&L5M>; + 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 2960000 1800000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 2960000 1800000>; + rgltr-load-current = <4000 913000 0 91400 119000 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 90 0>, + <&tlmm 15 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK1_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor8 { + cell-index = <8>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <0>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_rear_aux>; + actuator-src = <&actuator_rear_aux>; + led-flash-src = <&led_flash_rear_aux>; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&L1N>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L3M>; + cam_vaf-supply = <&L7M>; + cam_v_custom1-supply = <&L6M>; + 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 2960000 2800000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 2960000 2800000>; + rgltr-load-current = <6400 850000 0 114500 100000 140000>; + 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 89 0>, + <&tlmm 13 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK0_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + +}; + +&cam_cci1 { + actuator_triple_tele: qcom,actuator3{ + cell-index = <3>; + compatible = "qcom,actuator"; + cci-master = ; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2960000>; + rgltr-max-voltage = <2960000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + eeprom_tele: qcom,eeprom3 { + cell-index = <3>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L5M>; + 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 2960000>; + rgltr-max-voltage = <1800000 1056000 0 2800000 2960000>; + rgltr-load-current = <4000 260700 0 67700 100000>; + 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 92 0>, + <&tlmm 109 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor3 { + cell-index = <3>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <3>; + sensor-position-roll = <270>; + 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 = <&L5M>; + 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 2960000>; + rgltr-max-voltage = <1800000 1056000 0 2800000 2960000>; + rgltr-load-current = <4000 260700 0 67700 100000>; + 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 92 0>, + <&tlmm 109 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 = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK3_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + +}; + +&cam_cci2 { + eeprom_tof2: qcom,eeprom5 { + cell-index = <5>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&S7I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L5N>; + cam_v_custom1-supply = <&L7N>; + cam_v_custom2-supply = <&DBO3>; + regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana", + "cam_v_custom1", "cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1256000 0 2800000 3304000 3600000>; + rgltr-max-voltage = <1800000 1340000 0 2800000 3304000 3600000>; + rgltr-load-current = <155000 680000 0 50000 30000 2500000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk5_active + &cam_sensor_active_rst5>; + pinctrl-1 = <&cam_sensor_mclk5_suspend + &cam_sensor_suspend_rst5>; + gpios = <&tlmm 94 0>, + <&tlmm 110 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK5", + "CAM_RESET5"; + cci-master = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK5_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor5 { + cell-index = <5>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <5>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_tof2>; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&S7I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L5N>; + cam_v_custom1-supply = <&L7N>; + cam_v_custom2-supply = <&DBO3>; + regulator-names = "cam_vio", "cam_vdig", "cam_clk", "cam_vana", + "cam_v_custom1", "cam_v_custom2"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1256000 0 2800000 3304000 3600000>; + rgltr-max-voltage = <1800000 1340000 0 2800000 3304000 3600000>; + rgltr-load-current = <155000 680000 0 50000 30000 2500000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk5_active + &cam_sensor_active_rst5>; + pinctrl-1 = <&cam_sensor_mclk5_suspend + &cam_sensor_suspend_rst5>; + gpios = <&tlmm 94 0>, + <&tlmm 110 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK5", + "CAM_RESET5"; + cci-master = ; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK5_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; +}; + + +&qupv3_se9_i2c { + status = "ok"; + qcom,high-perf; + qcom,clk-freq-out = <1000000>; + qcom,pm-ctrl-client; + + eeprom_asc_front: qcom,eeprom1 { + cell-index = <4>; + reg = <0x58>; + compatible = "qcom,cam-i2c-eeprom"; + cam_vio-supply = <&L1I>; + cam_vdig-supply = <&L2N>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L6N>; + regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana"; + rgltr-cntrl-support; + rgltr-min-voltage = <1200000 1104000 0 2800000>; + rgltr-max-voltage = <1200000 1104000 0 2800000>; + rgltr-load-current = <3000 283000 0 50000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk4_active + &cam_sensor_active_rst4>; + pinctrl-1 = <&cam_sensor_mclk4_suspend + &cam_sensor_suspend_rst4>; + gpios = <&tlmm 93 0>, + <&tlmm 7 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK4", + "CAM_RESET4"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK4_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor1 { + cell-index = <4>; + reg = <0x22>; + compatible = "qcom,cam-i2c-sensor"; + csiphy-sd-index = <4>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_asc_front>; + cam_vio-supply = <&L1I>; + cam_vdig-supply = <&L2N>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L6N>; + regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana"; + rgltr-cntrl-support; + aon-camera-id = ; + rgltr-min-voltage = <1200000 1104000 0 2800000>; + rgltr-max-voltage = <1200000 1104000 0 2800000>; + rgltr-load-current = <3000 283000 0 50000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk4_active + &cam_sensor_active_rst4>; + pinctrl-1 = <&cam_sensor_mclk4_suspend + &cam_sensor_suspend_rst4>; + gpios = <&tlmm 93 0>, + <&tlmm 7 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK4", + "CAM_RESET4"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK4_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; +}; + +&i3c3 { + se-clock-frequency = <64000000>; + i3c-scl-hz = <8300000>; + dfs-index = <0>; + i2c-scl-hz = <1000000>; + qcom,pm-ctrl-client; + status = "ok"; + + actuator_UW_asc_rear: qcom,actuator@c { + cell-index = <1>; + compatible = "qcom,cam-i2c-actuator"; + reg = <0x0C 0x00 0x10>; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <2960000>; + rgltr-max-voltage = <2960000>; + rgltr-load-current = <100000>; + status = "ok"; + }; + + eeprom_asc_rear: qcom,eeprom@50 { + cell-index = <6>; + reg = <0x50 0x00 0x10>; + compatible = "qcom,cam-i2c-eeprom"; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&L1M>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L3M>; + cam_v_custom1-supply = <&L4N>; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana", + "cam_v_custom1", "cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 1104000 0 2800000 1800000 2960000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 1800000 2960000>; + rgltr-load-current = <6000 454000 0 77900 29400 100000>; + 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 91 0>, + <&tlmm 3 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + eeprom_i3c_UltraWide: qcom,eeprom@52 { + cell-index = <1>; + reg = <0x52 0x00 0x10>; + compatible = "qcom,cam-i2c-eeprom"; + cam_vio-supply = <&L1I>; + 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 = <1200000 1104000 0 2800000 2960000>; + rgltr-max-voltage = <1200000 1104000 0 2800000 2960000>; + rgltr-load-current = <3000 355000 0 95000 100000>; + 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 91 0>, + <&tlmm 3 0>; + gpio-reset = <1>; + gpio-req-tbl-num = <0 1>; + gpio-req-tbl-flags = <1 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor@33,36008580000 { + cell-index = <1>; + reg = <0x33 0x360 0x08580000>; + assigned-address = <0xa>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_i3c_UltraWide>; + actuator-src = <&actuator_UW_asc_rear>; + led-flash-src = <&led_flash_triple_rear_ultrawide>; + cam_vio-supply = <&L1I>; + 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; + aon-camera-id = ; + i3c-target; + rgltr-min-voltage = <1200000 1104000 0 2800000 2960000>; + rgltr-max-voltage = <1200000 1104000 0 2800000 2960000>; + rgltr-load-current = <3000 355000 0 95000 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_active_rst2 + &cam_sensor_i3cSelect_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_suspend_rst2 + &cam_sensor_i3cSelect_suspend>; + gpios = <&tlmm 91 0>, + <&tlmm 3 0>, + <&tlmm 6 0>; + gpio-reset = <1>; + gpio-custom1 = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2", + "CAM_I3CSELECT"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; + + qcom,cam-sensor@10 { + cell-index = <6>; + reg = <0x10 0x00 0x10>; + compatible = "qcom,cam-i2c-sensor"; + csiphy-sd-index = <2>; + sensor-position-roll = <90>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_asc_rear>; + actuator-src = <&actuator_UW_asc_rear>; + led-flash-src = <&led_flash_asc_rear>; + cam_vio-supply = <&L5M>; + cam_vdig-supply = <&L1M>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_vana-supply = <&L3M>; + cam_v_custom1-supply = <&L4N>; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana", + "cam_v_custom1", "cam_vaf"; + rgltr-cntrl-support; + aon-camera-id = ; + rgltr-min-voltage = <1800000 1104000 0 2800000 1800000 2960000>; + rgltr-max-voltage = <1800000 1104000 0 2800000 1800000 2960000>; + rgltr-load-current = <6000 454000 0 77900 29400 100000>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_active_rst2 + &cam_sensor_ponv_rear_active>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_suspend_rst2 + &cam_sensor_ponv_rear_suspend>; + gpios = <&tlmm 91 0>, + <&tlmm 3 0>, + <&tlmm 2 0>; + gpio-reset = <1>; + gpio-standby = <2>; + gpio-req-tbl-num = <0 1 2>; + gpio-req-tbl-flags = <1 0 0>; + gpio-req-tbl-label = "CAMIF_MCLK2", + "CAM_RESET2", + "CAM_STANDBY"; + clocks = <&cambistmclkcc CAM_BIST_MCLK_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <24000000>; + status = "ok"; + }; +}; diff --git a/sun-camera-sensor-qrd.dts b/sun-camera-sensor-qrd.dts index 7a25dd6f..2c5a52f9 100644 --- a/sun-camera-sensor-qrd.dts +++ b/sun-camera-sensor-qrd.dts @@ -20,5 +20,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x1000B 0>, <0x1001F 0>, <0x2000B 0>, <0x3000B 0>; + qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; }; From 64ec3483c81252848079dc9ddc01c53a8dd75c65 Mon Sep 17 00:00:00 2001 From: Abhilash Kumar Date: Fri, 13 Dec 2024 15:34:02 +0530 Subject: [PATCH 3/4] ARM: dts: msm: Update UBWC configuration for Kera This change updates UBWC configuration to be used for Kera LP4 device. CRs-Fixed: 4001817 Change-Id: I5dd36264a270564f59ea32b2cbe34f7086e5254c --- kera-camera.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 790ff951..fd1703b7 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -2048,7 +2048,7 @@ clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", "turbo"; src-clock-name = "tfe_0_clk_src"; clock-control-debugfs = "true"; - ubwc-static-cfg = <0x1026 0x1026>; + ubwc-static-cfg = <0x1016 0x1026>; cam_hw_pid = <0 9 16 4>; status = "ok"; }; @@ -2124,7 +2124,7 @@ "turbo"; src-clock-name = "tfe_1_clk_src"; clock-control-debugfs = "true"; - ubwc-static-cfg = <0x1026 0x1026>; + ubwc-static-cfg = <0x1016 0x1026>; cam_hw_pid = <1 10 17 5>; status = "ok"; }; @@ -2199,7 +2199,7 @@ clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", "turbo"; src-clock-name = "tfe_2_clk_src"; clock-control-debugfs = "true"; - ubwc-static-cfg = <0x1026 0x1026>; + ubwc-static-cfg = <0x1016 0x1026>; cam_hw_pid = <2 8 18 6>; status = "ok"; }; @@ -2342,8 +2342,8 @@ src-clock-name = "icp_clk_src"; clock-control-debugfs = "true"; fw_name = "CAMERA_ICP_970"; - ubwc-ipe-fetch-cfg = <0x707B 0x707B>; - ubwc-ipe-write-cfg = <0x161EF 0x161EF>; + ubwc-ipe-fetch-cfg = <0x7073 0x707B>; + ubwc-ipe-write-cfg = <0x161CF 0x161EF>; qos-val = <0x808>; fw-pas-id = <33>; cam_hw_pid = <11>; @@ -2384,8 +2384,8 @@ src-clock-name = "icp_1_clk_src"; clock-control-debugfs = "true"; fw_name = "CAMERA_ICP_1_970"; - ubwc-ofe-fetch-cfg = <0x707B 0x707B>; - ubwc-ofe-write-cfg = <0x161EF 0x161EF>; + ubwc-ofe-fetch-cfg = <0x7073 0x707B>; + ubwc-ofe-write-cfg = <0x161CF 0x161EF>; qos-val = <0x808>; fw-pas-id = <50>; cam_hw_pid = <10>; From f0fccb156b576880ba3e829562efce2704ac8cc6 Mon Sep 17 00:00:00 2001 From: Mukund Deshmukh Date: Wed, 11 Dec 2024 17:19:28 +0530 Subject: [PATCH 4/4] ARM: dts: msm: Current values updation based on latest PG Current values of regulators for below are modified as per PG - IMX766 - IMX858 - IMX688 - S5KJN1 - PHY CRs-Fixed: 3989900. Change-Id: Id399d21fef2831da3de77248b992017183184da5 --- kera-camera-sensor-mtp.dtsi | 24 +++++++++++----------- kera-camera.dtsi | 41 +++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/kera-camera-sensor-mtp.dtsi b/kera-camera-sensor-mtp.dtsi index bfd880a2..acc3c9d0 100644 --- a/kera-camera-sensor-mtp.dtsi +++ b/kera-camera-sensor-mtp.dtsi @@ -48,7 +48,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <103000>; + rgltr-load-current = <118930>; status = "ok"; }; @@ -62,7 +62,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <103000>; + rgltr-load-current = <103360>; status = "ok"; }; @@ -78,7 +78,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <1800000 2800000 0>; rgltr-max-voltage = <1980000 3000000 0>; - rgltr-load-current = <3500 214290 0>; + rgltr-load-current = <3500 220000 0>; status = "ok"; }; @@ -97,7 +97,7 @@ 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>; + rgltr-load-current = <3500 913200 0 91430 118930 63100>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -133,7 +133,7 @@ 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>; + rgltr-load-current = <4060 523640 0 107500 103360>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -176,7 +176,7 @@ 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>; + rgltr-load-current = <4060 523640 0 107500 103360>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk0_active @@ -221,7 +221,7 @@ 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>; + rgltr-load-current = <3500 913200 0 91430 118930 63100>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk1_active @@ -255,7 +255,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <2800000>; rgltr-max-voltage = <3000000>; - rgltr-load-current = <130000>; + rgltr-load-current = <130040>; status = "ok"; }; @@ -273,7 +273,7 @@ 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>; + rgltr-load-current = <4500 266330 0 69000 130040>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active @@ -309,7 +309,7 @@ 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>; + rgltr-load-current = <5560 454290 0 77860 29440>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active @@ -350,7 +350,7 @@ 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>; + rgltr-load-current = <5560 454290 0 77860 29440>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk3_active @@ -393,7 +393,7 @@ 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>; + rgltr-load-current = <4500 266330 0 69000 130040>; gpio-no-mux = <0>; pinctrl-names = "cam_default", "cam_suspend"; pinctrl-0 = <&cam_sensor_mclk2_active diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 790ff951..c08f5417 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -487,7 +487,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy0_clk", @@ -521,7 +521,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy1_clk", @@ -555,7 +555,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy2_clk", @@ -576,7 +576,7 @@ cam_csiphy3: qcom,csiphy3@adaf000 { cell-index = <3>; - compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; + compatible = "qcom,csiphy-v2.2.1", "qcom,csiphy"; reg = <0x0adaf000 0x2000>; reg-names = "csiphy"; reg-cam-base = <0x1af000>; @@ -589,7 +589,7 @@ rgltr-cntrl-support; rgltr-min-voltage = <0 1200000 880000>; rgltr-max-voltage = <0 1320000 950000>; - rgltr-load-current = <0 14120 145800>; + rgltr-load-current = <0 7810 82290>; shared-clks = <1 0 0 0>; clock-names = "cphy_rx_clk_src", "csiphy3_clk", @@ -840,6 +840,35 @@ status = "ok"; }; + cam_csiphy_tpg15: qcom,tpg15@ad8c000 { + cell-index = <15>; + phy-id = <1>; + hw-no-ops; + compatible = "qcom,cam-tpg104"; + reg-names = "tpg1", "cam_cpas_top"; + reg = <0x0ad8c000 0x400>, + <0x0ac04000 0x1000>; + reg-cam-base = <0x18c000 0x04000>; + regulator-names = "gdsc"; + gdsc-supply = <&cam_cc_titan_top_gdsc>; + interrupt-names = "tpg1"; + interrupts = ; + shared-clks = <1 0>; + clock-names = + "cphy_rx_clk_src", + "csid_csiphy_rx_clk"; + clocks = + <&camcc CAM_CC_CPHY_RX_CLK_SRC>, + <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; + clock-rates = + <400000000 0>, + <400000000 0>, + <480000000 0>; + clock-cntl-level = "lowsvs", "svs", "nominal"; + src-clock-name = "cphy_rx_clk_src"; + status = "ok"; + }; + qcom,cam_smmu { compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; @@ -1214,7 +1243,7 @@ "ife0", "ife1", "ife2", "ife3", "ipe0", "rt-cdm0", "rt-cdm1", "rt-cdm2", "rt-cdm3", "cam-cdm-intf0", "icp0", "icp1", "ofe0", "cre0", - "jpeg-dma0", "jpeg-enc0", "tpg13", "tpg14"; + "jpeg-dma0", "jpeg-enc0", "tpg13", "tpg14", "tpg15"; sys-cache-names = "ofe_ip", "ipe_rt_ip", "ipe_srt_ip", "ipe_rt_rf", "ipe_srt_rf"; sys-cache-uids = <71 72 73 74 75>; sys-cache-concur = <1 1 1 0 0>;