From cb72baf68d97ec0a07d8a93e4d8d6e701beb0e84 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 7 Jan 2021 11:10:32 +0800 Subject: [PATCH 1/4] ARM: dts: msm: Add new node for HHG camera device Override existing nodes for lahaina as MCLK and Voltage changed for HHG platform. Change-Id: I337e137a883b643d8501ef39cbb62e3d38a67c89 CRs-Fixed: 2853048 --- lahaina-camera-sensor-hhg.dtsi | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 lahaina-camera-sensor-hhg.dtsi diff --git a/lahaina-camera-sensor-hhg.dtsi b/lahaina-camera-sensor-hhg.dtsi new file mode 100644 index 000000000000..52fbf46d4e32 --- /dev/null +++ b/lahaina-camera-sensor-hhg.dtsi @@ -0,0 +1,78 @@ +&cam_cci1 { +/delete-node/ qcom,eeprom5; +/delete-node/ qcom,cam-sensor5; + + qcom,eeprom5 { + cell-index = <5>; + compatible = "qcom,eeprom"; + cam_vio-supply = <&pm8008j_l3>; + cam_vana-supply = <&pm8008j_l5>; + cam_vdig-supply = <&pm8008j_l1>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0>; + rgltr-max-voltage = <1800000 2800000 1150000 0>; + rgltr-load-current = <5000 35000 301000 0>; + 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 105 0>, + <&tlmm 115 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 = <1>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK5_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <19200000>; + }; + + qcom,cam-sensor5 { + cell-index = <2>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <5>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <0>; + eeprom-src = <&eeprom_front>; + cam_vio-supply = <&pm8008j_l3>; + cam_vana-supply = <&pm8008j_l5>; + cam_vdig-supply = <&pm8008j_l1>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + cam_bob-supply = <&pm8350c_bob>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", + "cam_clk", "cam_bob"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1100000 0 3200000>; + rgltr-max-voltage = <1800000 2800000 1150000 0 3960000>; + rgltr-load-current = <5000 35000 301000 0 2000000>; + 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 105 0>, + <&tlmm 115 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 = <1>; + status = "ok"; + clocks = <&clock_camcc CAM_CC_MCLK5_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "nominal"; + clock-rates = <19200000>; + }; +}; From 9d5548f7b69fc9a85e3433188a147f03c99b2741 Mon Sep 17 00:00:00 2001 From: Tejas Prajapati Date: Wed, 3 Feb 2021 17:15:13 +0530 Subject: [PATCH 2/4] ARM: dts: msm: Update correct PID for the IFE2 For IFE2 the correct PID is 30. CRs-Fixed: 2872016 Change-Id: I5d90effc6166e725a80af2ae963992492c96d4c7 --- shima-camera.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shima-camera.dtsi b/shima-camera.dtsi index 3b923c783d9e..269ed5d32abb 100644 --- a/shima-camera.dtsi +++ b/shima-camera.dtsi @@ -929,7 +929,7 @@ scl-clk-names = "ife_2_areg"; clock-control-debugfs = "true"; ubwc-static-cfg = <0x1016 0x1026>; - cam_hw_pid = < 23 6 18 10>; + cam_hw_pid = < 30 6 18 10>; status = "ok"; }; From a51ff49cbf4a22746c64f280448f50bf4945822b Mon Sep 17 00:00:00 2001 From: Anil Kumar Kanakanti Date: Mon, 14 Dec 2020 19:08:10 +0530 Subject: [PATCH 3/4] ARM: dts: msm: Add support for CSI PHY SW fuse Add support for enabling CSIPHY fuse for yupik platform. CRs-Fixed: 2869783 Change-Id: I3e91c1a963e239b32237c44fc40d3557cd8487f9 --- yupik-camera.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yupik-camera.dtsi b/yupik-camera.dtsi index 297a17433c77..b7fe50cbc3d2 100644 --- a/yupik-camera.dtsi +++ b/yupik-camera.dtsi @@ -789,7 +789,8 @@ cam_hw_fuse = , , , - ; + , + ; interrupt-names = "cpas_camnoc"; interrupts = ; camnoc-axi-min-ib-bw = <3000000000>; From 3a102dd6c96376b6b663d2a5edf192cfea673a9a Mon Sep 17 00:00:00 2001 From: Anil Kumar Kanakanti Date: Wed, 27 Jan 2021 21:43:59 +0530 Subject: [PATCH 4/4] ARM: dts: msm: Add support for JD1 sensor for yupik Add support for JD1 sensor for yupik using JD1+GC630 camera DC. CRs-Fixed: 2869700 Change-Id: Iffcdf5062dbf2fcbccdb3cb29848956485339cfc --- yupik-camera-sensor-idp.dtsi | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/yupik-camera-sensor-idp.dtsi b/yupik-camera-sensor-idp.dtsi index 38412647ba8d..f4ed67f88ad1 100644 --- a/yupik-camera-sensor-idp.dtsi +++ b/yupik-camera-sensor-idp.dtsi @@ -383,4 +383,48 @@ clock-cntl-level = "nominal"; clock-rates = <24000000>; }; + /* Rear */ + qcom,cam-sensor4 { + cell-index = <1>; + compatible = "qcom,cam-sensor"; + csiphy-sd-index = <1>; + sensor-position-roll = <270>; + sensor-position-pitch = <0>; + sensor-position-yaw = <180>; + eeprom-src = <&eeprom_triple_uw>; + actuator-src = <&actuator_triple_uw>; + cam_vio-supply = <&L3J>; + cam_vana-supply = <&L6I>; + cam_vdig-supply = <&L2I>; + cam_clk-supply = <&cam_cc_titan_top_gdsc>; + regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk"; + rgltr-cntrl-support; + rgltr-min-voltage = <1800000 2800000 1056000 0>; + rgltr-max-voltage = <1800000 2900000 1150000 0>; + rgltr-load-current = <3000 52000 257000 0>; + gpio-no-mux = <0>; + pinctrl-names = "cam_default", "cam_suspend", "cam_mux"; + pinctrl-0 = <&cam_sensor_mclk2_active + &cam_sensor_active_rst2 + &cam_sensor_active_mux>; + pinctrl-1 = <&cam_sensor_mclk2_suspend + &cam_sensor_suspend_rst2 + &cam_sensor_suspend_mux>; + gpios = <&tlmm 66 0>, + <&tlmm 77 0>, + <&tlmm 1 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_MUX"; + cci-master = <0>; + status = "ok"; + clocks = <&camcc CAM_CC_MCLK2_CLK>; + clock-names = "cam_clk"; + clock-cntl-level = "turbo"; + clock-rates = <24000000>; + }; };