From 10fabceff35cca072144bb9e3efb2e66dacf378a Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 3 Jun 2024 10:50:45 -0700 Subject: [PATCH 01/12] CAMX: Snap for drop 05/30/2024 mainline 1206 LA.VENDOR.15.4.0.AU354 Change-Id: Iacff39bf835c862dc07e5bd3aea97db96184df90 Signed-off-by: Haritha Chintalapati From 0f3ad263b024298cd9e9900eefe5a980dec791d7 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 3 Jun 2024 10:50:49 -0700 Subject: [PATCH 02/12] CAMX: Snap for drop 05/31/2024 mainline 1207 LA.VENDOR.15.4.0.AU354 Change-Id: I19bd659e33fa98d64da8e8abfb387106ba757f90 Signed-off-by: Haritha Chintalapati From bcddbce1bbbd9fb2c3513dd0932d5d4601d42d90 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 3 Jun 2024 15:45:01 -0700 Subject: [PATCH 03/12] CAMX: Snap for drop 06/03/2024 mainline 1208 LA.VENDOR.15.4.0.AU354 Change-Id: I753f7ffc7d9b6f49639f44d0155ab98f814232ce Signed-off-by: Haritha Chintalapati From 271b8fc07fc883dd6151923eb024a48b411008cf Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 5 Jun 2024 12:41:54 -0700 Subject: [PATCH 04/12] CAMX: Snap for drop 06/04/2024 mainline 1209 LA.VENDOR.15.4.0.AU363 Change-Id: I34455e3c3da077f4fe336e9c86257fba2d09232f Signed-off-by: Haritha Chintalapati From 2a6c81ad4c2bdef8ed8e2438475e23f6a697d8a8 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 5 Jun 2024 12:41:58 -0700 Subject: [PATCH 05/12] CAMX: Snap for drop 06/05/2024 mainline 1210 LA.VENDOR.15.4.0.AU363 Change-Id: Iab7e692467fbd6f89ec427bce8542e9efc199ce7 Signed-off-by: Haritha Chintalapati From 9899a066d3f41b6678052aa146e45d47f4e7ca3d Mon Sep 17 00:00:00 2001 From: Karthik Anantha Ram Date: Sun, 9 Jun 2024 23:14:17 -0700 Subject: [PATCH 06/12] ARM: dts: msm: Update OFE write ubwc config for Pakala This change updates the UBWC write config for OFE on Pakala. CRs-Fixed: 3833870 Change-Id: I21138604bdd7927f56c4ed6409537c0344ae1132 Signed-off-by: Karthik Anantha Ram --- sun-camera.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index efa53d5b..726439eb 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -3201,7 +3201,7 @@ clock-control-debugfs = "true"; fw_name = "CAMERA_ICP_1"; ubwc-ofe-fetch-cfg = <0x3f083 0x3f083>; - ubwc-ofe-write-cfg = <0x16209 0x16209>; + ubwc-ofe-write-cfg = <0x1620F 0x1620F>; qos-val = <0x808>; fw-pas-id = <50>; cam_hw_pid = <10>; From ef1adb46651d2dc24187b05ee296cf6517d5ac4d Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 6 Jun 2024 16:09:52 -0700 Subject: [PATCH 07/12] CAMX: Snap for drop 06/06/2024 mainline 1211 LA.VENDOR.15.4.0.AU363 Change-Id: I31f884b927d5700842c610dc0a9a2c1588ad7ac4 Signed-off-by: Haritha Chintalapati From 28b5baa021312fe21b63e8d4a5b03a8da22fdda9 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Sun, 9 Jun 2024 23:14:13 -0700 Subject: [PATCH 08/12] CAMX: Snap for drop 06/07/2024 mainline 1212 LA.VENDOR.15.4.0.AU363 Change-Id: I986be1fa76033f71aaac7cb55885272591ad6e78 Signed-off-by: Haritha Chintalapati From b87c3a36f6586db02eeefb78bea5e7edb67a8802 Mon Sep 17 00:00:00 2001 From: liji Date: Mon, 10 Jun 2024 23:46:49 -0700 Subject: [PATCH 09/12] ARM: dts: msm: Add IMX766 LPAI OIS module configuration Add IMX766 LPAI OIS sensor module configuration in Pakala MTP dtsi CRs-Fixed: 3797440 Change-Id: I58bd23e04483701401524d47fd886dc298c41884 Signed-off-by: liji --- sun-camera-sensor-mtp.dtsi | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/sun-camera-sensor-mtp.dtsi b/sun-camera-sensor-mtp.dtsi index 94ddcf35..1e993b1b 100644 --- a/sun-camera-sensor-mtp.dtsi +++ b/sun-camera-sensor-mtp.dtsi @@ -94,6 +94,20 @@ status = "ok"; }; + lpai_ois: qcom,ois1 { + cell-index = <9>; + compatible = "qcom,ois"; + cci-master = ; + cam_vio-supply = <&L1I>; + cam_vaf-supply = <&L7M>; + regulator-names = "cam_vio","cam_vaf"; + rgltr-cntrl-support; + rgltr-min-voltage = <1200000 2960000>; + rgltr-max-voltage = <1200000 2960000>; + rgltr-load-current = <3000 220000>; + status = "ok"; + }; + eeprom_tof1: qcom,eeprom7 { cell-index = <7>; compatible = "qcom,eeprom"; @@ -330,6 +344,50 @@ status = "ok"; }; + qcom,cam-sensor9 { + cell-index = <9>; + 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 = <&lpai_ois>; + 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"; + }; + }; &cam_cci1 { From 43bfffc59f552a3ab1a164af5dffb3c4bc3733b1 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 10 Jun 2024 23:46:53 -0700 Subject: [PATCH 10/12] CAMX: Snap for drop 06/10/2024 mainline 1213 LA.VENDOR.15.4.0.AU363 a47636f Merge 'ARM: dts: msm: Add IMX766 LPAI OIS module configuration' into camera-kernel.lnx.dev 2be5024 Merge 'ARM: dts: msm: Update OFE write ubwc config for Pakala' into camera-kernel.lnx.dev Change-Id: I2ddc97df76f1762e72ca084d1f510982ded87db8 Signed-off-by: Haritha Chintalapati From b8f306393d0944b5a72885eb8574f90d582f07ad Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 11 Jun 2024 18:03:30 -0700 Subject: [PATCH 11/12] CAMX: Snap for drop 06/11/2024 mainline 1214 LA.VENDOR.15.4.0.AU369 Change-Id: If2896ecc41bb89661401046764136b0fee9acd14 Signed-off-by: Haritha Chintalapati From 2638faa245551188047936fde58ba2a96f5e1451 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 13 Jun 2024 01:40:32 -0700 Subject: [PATCH 12/12] CAMX: Snap for drop 06/12/2024 mainline 1215 LA.VENDOR.15.4.0.AU369 Change-Id: I60b350539fa94748c3211225b8b74c91b69da779 Signed-off-by: Haritha Chintalapati