From c14e65e2436dad2f0e13a0a6ea572bb7291cbac1 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 19 Mar 2024 13:36:07 -0700 Subject: [PATCH 01/22] CAMX: Snap for drop 03/14/2024 mainline 1159 LA.VENDOR.15.4.0.AU270 Change-Id: Iea923823962d68ec3044b3448d4636fa343066da Signed-off-by: Haritha Chintalapati From 174a550831de51e1f38b487f7a88bb5434cbe7be Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 19 Mar 2024 13:36:19 -0700 Subject: [PATCH 02/22] CAMX: Snap for drop 03/18/2024 mainline 1160 LA.VENDOR.15.4.0.AU270 Change-Id: I3c5e72b386e1b9ebc665dc648ee0ede56e6e8fb3 Signed-off-by: Haritha Chintalapati From 858bcf1f1fffefc9e0be674551d5c9951c6559e4 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 20 Mar 2024 11:09:28 -0700 Subject: [PATCH 03/22] CAMX: Snap for drop 03/20/2024 mainline 1161 LA.VENDOR.15.4.0.AU278 Change-Id: I929c0e015d64d0ee90da37830954eb92eadd435a Signed-off-by: Haritha Chintalapati From c976d6a547517a2dd1dae0350ad809ab0f351f1c Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 21 Mar 2024 17:35:56 -0700 Subject: [PATCH 04/22] CAMX: Snap for drop 03/20/2024 mainline 1162 LA.VENDOR.15.4.0.AU278 Change-Id: I27667c98fa80ec641ef06e10e6fe9de903893a1c Signed-off-by: Haritha Chintalapati From 33735e43018504219b403485c335a87c497e5057 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 21 Mar 2024 17:35:59 -0700 Subject: [PATCH 05/22] CAMX: Snap for drop 03/21/2024 mainline 1163 LA.VENDOR.15.4.0.AU278 Change-Id: If0dde0cb9404505340b99d8055588025194e1310 Signed-off-by: Haritha Chintalapati From 59fc199d70b5782f634fa378053f83a9f9a69355 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Sat, 23 Mar 2024 15:26:01 -0700 Subject: [PATCH 06/22] CAMX: Snap for drop 03/22/2024 mainline 1164 LA.VENDOR.15.4.0.AU278 Change-Id: If20c22f64bc7e5a9aaa139a57682b1828ab61d8d Signed-off-by: Haritha Chintalapati From 86b274f07278d606db900c5463892b48588cb73f Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 25 Mar 2024 20:51:55 -0700 Subject: [PATCH 07/22] CAMX: Snap for drop 03/25/2024 mainline 1165 LA.VENDOR.15.4.0.AU278 Change-Id: I4071a7ec0f3985266af84211b14e4866f2f49345 Signed-off-by: Haritha Chintalapati From 2964bdf933c0bb97e2f64f0980b81faa2302aa73 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 28 Mar 2024 18:00:18 -0700 Subject: [PATCH 08/22] CAMX: Snap for drop 03/27/2024 mainline 1166 LA.VENDOR.15.4.0.AU284 Change-Id: I4ca75dd630ae668800d4ad06b006b920cb63a28e Signed-off-by: Haritha Chintalapati From dfb7c5948a758c06c22f5da378c381798239025e Mon Sep 17 00:00:00 2001 From: Mukund Madhusudan Atre Date: Thu, 28 Mar 2024 18:00:21 -0700 Subject: [PATCH 09/22] ARM: dts: msm: Fix reg cam base for camera nodes in sun Currently, the register base addresses in the reg cam base property of camera nodes are incorrect. Update the values to reflect the correct difference with camera base. Also, update the reg base addresses in all the camera nodes for uniformity. CRs-Fixed: 3762492 Change-Id: Idfa710a05b4e1f45ea6739b04ba739160b8b9f03 Signed-off-by: Mukund Madhusudan Atre --- sun-camera.dtsi | 120 ++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 8430eb36..816f8fcc 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -876,7 +876,7 @@ compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; reg = <0x0ada9000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xa9000>; + reg-cam-base = <0x1a9000>; interrupt-names = "CSIPHY0"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -908,9 +908,9 @@ cam_csiphy1: qcom,csiphy1@adab000 { cell-index = <1>; compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; - reg = <0xadab000 0x2000>; + reg = <0x0adab000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xab000>; + reg-cam-base = <0x1ab000>; interrupt-names = "CSIPHY1"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -942,9 +942,9 @@ cam_csiphy2: qcom,csiphy2@adad000 { cell-index = <2>; compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; - reg = <0xadad000 0x2000>; + reg = <0x0adad000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xad000>; + reg-cam-base = <0x1ad000>; interrupt-names = "CSIPHY2"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -976,9 +976,9 @@ cam_csiphy3: qcom,csiphy3@adaf000 { cell-index = <3>; compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; - reg = <0xadaf000 0x2000>; + reg = <0x0adaf000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xaf000>; + reg-cam-base = <0x1af000>; interrupt-names = "CSIPHY3"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -1010,9 +1010,9 @@ cam_csiphy4: qcom,csiphy4@adb1000 { cell-index = <4>; compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; - reg = <0xadb1000 0x2000>; + reg = <0x0adb1000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xb1000>; + reg-cam-base = <0x1b1000>; interrupt-names = "CSIPHY4"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -1044,9 +1044,9 @@ cam_csiphy5: qcom,csiphy5@adb3000 { cell-index = <5>; compatible = "qcom,csiphy-v2.3.0", "qcom,csiphy"; - reg = <0xadb3000 0x2000>; + reg = <0x0adb3000 0x2000>; reg-names = "csiphy"; - reg-cam-base = <0xb3000>; + reg-cam-base = <0x1b3000>; interrupt-names = "CSIPHY5"; interrupts = ; regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9"; @@ -1078,7 +1078,7 @@ cam_cci0: qcom,cci0@ac7b000 { cell-index = <0>; compatible = "qcom,cci", "simple-bus"; - reg = <0xac7b000 0x1000>; + reg = <0x0ac7b000 0x1000>; reg-names = "cci"; reg-cam-base = <0x7b000>; interrupt-names = "CCI0"; @@ -1166,7 +1166,7 @@ cam_cci1: qcom,cci1@ac7c000 { cell-index = <1>; compatible = "qcom,cci", "simple-bus"; - reg = <0xac7c000 0x1000>; + reg = <0x0ac7c000 0x1000>; reg-names = "cci"; reg-cam-base = <0x7c000>; interrupt-names = "CCI1"; @@ -1254,7 +1254,7 @@ cam_cci2: qcom,cci2@ac7d000 { cell-index = <2>; compatible = "qcom,cci", "simple-bus"; - reg = <0xac7d000 0x1000>; + reg = <0x0ac7d000 0x1000>; reg-names = "cci"; reg-cam-base = <0x7d000>; interrupt-names = "CCI2"; @@ -1607,12 +1607,12 @@ label = "cpas"; arch-compat = "cpas_top"; reg-names = "cam_cpas_top", "cam_camnoc_nrt", "cam_camnoc_rt", "cam_rpmh", "cam_cesta"; - reg = <0xac04000 0x1000>, + reg = <0x0ac04000 0x1000>, <0x0ac62000 0x9200>, <0x0ad90000 0x9000>, - <0xbbf0000 0x1f00>, - <0xadcb000 0x5000>; - reg-cam-base = <0x4000 0x62000 0x190000 0x0bbf0000 0xadcb000>; + <0x0bbf0000 0x1f00>, + <0x0adcb000 0x5000>; + reg-cam-base = <0x4000 0x62000 0x190000 0x0bbf0000 0x0adcb000>; interrupt-names = "cpas_camnoc_rt", "cpas_camnoc_nrt"; interrupts = , ; @@ -2480,7 +2480,7 @@ cell-index = <0>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; - reg = <0xac7f000 0x580>; + reg = <0x0ac7f000 0x580>; reg-names = "rt-cdm0"; reg-cam-base = <0x7f000>; interrupt-names = "rt-cdm0"; @@ -2505,7 +2505,7 @@ cell-index = <1>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; - reg = <0xac80000 0x580>; + reg = <0x0ac80000 0x580>; reg-names = "rt-cdm1"; reg-cam-base = <0x80000>; interrupt-names = "rt-cdm1"; @@ -2530,7 +2530,7 @@ cell-index = <2>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; - reg = <0xac81000 0x580>; + reg = <0x0ac81000 0x580>; reg-names = "rt-cdm2"; reg-cam-base = <0x81000>; interrupt-names = "rt-cdm2"; @@ -2555,7 +2555,7 @@ cell-index = <3>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; - reg = <0xac82000 0x580>; + reg = <0x0ac82000 0x580>; reg-names = "rt-cdm3"; reg-cam-base = <0x82000>; interrupt-names = "rt-cdm3"; @@ -2580,7 +2580,7 @@ cell-index = <4>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; - reg = <0xac83000 0x580>; + reg = <0x0ac83000 0x580>; reg-names = "rt-cdm4"; reg-cam-base = <0x83000>; interrupt-names = "rt-cdm4"; @@ -2611,8 +2611,8 @@ cell-index = <0>; compatible = "qcom,csid980"; reg-names = "csid"; - reg = <0xad27000 0x2b00>; - reg-cam-base = <0x27000>; + reg = <0x0ad27000 0x2b00>; + reg-cam-base = <0x127000>; rt-wrapper-base = <0x86000>; interrupt-names = "csid0"; interrupts = ; @@ -2645,7 +2645,7 @@ cell-index = <0>; compatible = "qcom,mc_tfe980"; reg-names = "ife", "cam_camnoc_rt"; - reg = <0xac86000 0x10000>, + reg = <0x0ac86000 0x10000>, <0x0ad90000 0x9000>; reg-cam-base = <0x86000 0x19000>; rt-wrapper-base = <0x86000>; @@ -2690,8 +2690,8 @@ cell-index = <1>; compatible = "qcom,csid980"; reg-names = "csid"; - reg = <0xad2a000 0x2b00>; - reg-cam-base = <0x2a000>; + reg = <0x0ad2a000 0x2b00>; + reg-cam-base = <0x12a000>; rt-wrapper-base = <0x86000>; interrupt-names = "csid1"; interrupts = ; @@ -2724,7 +2724,7 @@ cell-index = <1>; compatible = "qcom,mc_tfe980"; reg-names = "ife", "cam_camnoc_rt"; - reg = <0xac96000 0x10000>, + reg = <0x0ac96000 0x10000>, <0x0ad90000 0x9000>; reg-cam-base = <0x96000 0x19000>; rt-wrapper-base = <0x86000>; @@ -2769,8 +2769,8 @@ cell-index = <2>; compatible = "qcom,csid980"; reg-names = "csid"; - reg = <0xad2d000 0x2b00>; - reg-cam-base = <0x2d000>; + reg = <0x0ad2d000 0x2b00>; + reg-cam-base = <0x12d000>; rt-wrapper-base = <0x86000>; interrupt-names = "csid2"; interrupts = ; @@ -2803,7 +2803,7 @@ cell-index = <2>; compatible = "qcom,mc_tfe980"; reg-names = "ife", "cam_camnoc_rt"; - reg = <0xaca6000 0x10000>, + reg = <0x0aca6000 0x10000>, <0x0ad90000 0x9000>; reg-cam-base = <0xa6000 0x19000>; rt-wrapper-base = <0x86000>; @@ -2848,9 +2848,9 @@ cell-index = <3>; compatible = "qcom,csid-lite980"; reg-names = "csid-lite"; - reg = <0xad6d000 0xa00>; - reg-cam-base = <0x6d000>; - rt-wrapper-base = <0x6c000>; + reg = <0x0ad6d000 0xa00>; + reg-cam-base = <0x16d000>; + rt-wrapper-base = <0x16c000>; interrupt-names = "csid-lite0"; interrupts = ; regulator-names = "gdsc"; @@ -2888,9 +2888,9 @@ cell-index = <3>; compatible = "qcom,vfe-lite980"; reg-names = "ife-lite"; - reg = <0xad6d000 0x2800>; - reg-cam-base = <0x6d000>; - rt-wrapper-base = <0x6c000>; + reg = <0x0ad6d000 0x2800>; + reg-cam-base = <0x16d000>; + rt-wrapper-base = <0x16c000>; interrupt-names = "ife-lite0"; interrupts = ; regulator-names = "gdsc"; @@ -2929,9 +2929,9 @@ cell-index = <4>; compatible = "qcom,csid-lite980"; reg-names = "csid-lite"; - reg = <0xad72000 0xa00>; - reg-cam-base = <0x72000>; - rt-wrapper-base = <0x6c000>; + reg = <0x0ad72000 0xa00>; + reg-cam-base = <0x172000>; + rt-wrapper-base = <0x16c000>; interrupt-names = "csid-lite1"; interrupts = ; regulator-names = "gdsc"; @@ -2969,9 +2969,9 @@ cell-index = <4>; compatible = "qcom,vfe-lite980"; reg-names = "ife-lite"; - reg = <0xad72000 0x2800>; - reg-cam-base = <0x72000>; - rt-wrapper-base = <0x6c000>; + reg = <0x0ad72000 0x2800>; + reg-cam-base = <0x172000>; + rt-wrapper-base = <0x16c000>; interrupt-names = "ife-lite1"; interrupts = ; regulator-names = "gdsc"; @@ -3011,9 +3011,9 @@ phy-id = <0>; compatible = "qcom,cam-tpg104"; reg-names = "tpg0", "cam_cpas_top"; - reg = <0xad8b000 0x400>, - <0xac04000 0x1000>; - reg-cam-base = <0x8b000 0x04000>; + reg = <0x0ad8b000 0x400>, + <0x0ac04000 0x1000>; + reg-cam-base = <0x18b000 0x04000>; regulator-names = "gdsc"; gdsc-supply = <&cam_cc_titan_top_gdsc>; interrupt-names = "tpg0"; @@ -3039,9 +3039,9 @@ phy-id = <1>; compatible = "qcom,cam-tpg104"; reg-names = "tpg1", "cam_cpas_top"; - reg = <0xad8c000 0x400>, - <0xac04000 0x1000>; - reg-cam-base = <0x8c000 0x04000>; + reg = <0x0ad8c000 0x400>, + <0x0ac04000 0x1000>; + reg-cam-base = <0x18c000 0x04000>; regulator-names = "gdsc"; gdsc-supply = <&cam_cc_titan_top_gdsc>; interrupt-names = "tpg1"; @@ -3067,9 +3067,9 @@ phy-id = <2>; compatible = "qcom,cam-tpg104"; reg-names = "tpg2", "cam_cpas_top"; - reg = <0xad8d000 0x400>, - <0xac04000 0x1000>; - reg-cam-base = <0x8d000 0x04000>; + reg = <0x0ad8d000 0x400>, + <0x0ac04000 0x1000>; + reg-cam-base = <0x18d000 0x04000>; regulator-names = "gdsc"; gdsc-supply = <&cam_cc_titan_top_gdsc>; interrupt-names = "tpg2"; @@ -3122,7 +3122,7 @@ cell-index = <0>; compatible = "qcom,cam-icp_v2_1"; icp-version = <0x0201>; - reg = <0xac06000 0x1000>, + reg = <0x0ac06000 0x1000>, <0x0ac09000 0x1000>; reg-names = "icp_csr", "icp_wd0"; reg-cam-base = <0x6000 0x9000>; @@ -3166,8 +3166,8 @@ cell-index = <1>; compatible = "qcom,cam-icp_v2_1"; icp-version = <0x0201>; - reg = <0xac16000 0x1000>, - <0xac19000 0x1000>; + reg = <0x0ac16000 0x1000>, + <0x0ac19000 0x1000>; reg-names = "icp_csr", "icp_wd0"; reg-cam-base = <0x16000 0x19000>; interrupt-names = "icp1"; @@ -3209,7 +3209,7 @@ cam_ipe0: qcom,ipe0@ac42000 { cell-index = <0>; compatible = "qcom,cam-ipe680"; - reg = <0xac42000 0x18000>; + reg = <0x0ac42000 0x18000>; reg-names = "ipe0_top"; reg-cam-base = <0x42000>; regulator-names = "ipe0-vdd"; @@ -3249,7 +3249,7 @@ cam_ofe: qcom,ofe@ac2a000 { cell-index = <0>; compatible = "qcom,cam-ofe"; - reg = <0xac2a000 0x18000>; + reg = <0x0ac2a000 0x18000>; reg-names = "ofe0_top"; reg-cam-base = <0x2a000>; regulator-names = "ofe0-vdd"; @@ -3307,7 +3307,7 @@ cell-index = <0>; compatible = "qcom,cam_jpeg_enc_780"; reg-names = "jpegenc_hw", "cam_camnoc_nrt"; - reg = <0xac25000 0x1000>, + reg = <0x0ac25000 0x1000>, <0x0ac62000 0x9200>; reg-cam-base = <0x25000 0x62000>; interrupt-names = "jpeg_enc0"; @@ -3337,7 +3337,7 @@ cell-index = <0>; compatible = "qcom,cam_jpeg_dma_780"; reg-names = "jpegdma_hw", "cam_camnoc_nrt"; - reg = <0xac26000 0x1000>, + reg = <0x0ac26000 0x1000>, <0x0ac62000 0x9200>; reg-cam-base = <0x26000 0x62000>; interrupt-names = "jpeg_dma0"; From 6f160d4e1582c3ebc2deba351bfb8366cfb2a584 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 28 Mar 2024 18:00:23 -0700 Subject: [PATCH 10/22] CAMX: Snap for drop 03/28/2024 mainline 1167 LA.VENDOR.15.4.0.AU284 15e58ac Merge 'ARM: dts: msm: Fix reg cam base for camera nodes in sun' into camera-kernel.lnx.dev Change-Id: I9b9a401d680abae09cfc6562e0b433b19e4c3034 Signed-off-by: Haritha Chintalapati From cb62ae1e8151544a358d55cb08ea43335d12f6d3 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Fri, 29 Mar 2024 17:49:53 -0700 Subject: [PATCH 11/22] CAMX: Snap for drop 03/29/2024 mainline 1168 LA.VENDOR.15.4.0.AU284 Change-Id: Iaa3e1eef26b7fa8f914a27b8448500628f71d6e8 Signed-off-by: Haritha Chintalapati From 5787eb38ad5cb55813ea9b59ba6166da239db078 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 1 Apr 2024 21:44:55 -0700 Subject: [PATCH 12/22] CAMX: Snap for drop 04/01/2024 mainline 1168_1 LA.VENDOR.15.4.0.AU284 Change-Id: Ide2c22cc972c9795908ffc7bd4a519e4fcc15289 Signed-off-by: Haritha Chintalapati From 71d5f566a8f768adfbe82e2fdc3cdeaefb5a2463 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 2 Apr 2024 22:35:38 -0700 Subject: [PATCH 13/22] CAMX: Snap for drop 04/01/2024 mainline 1169 LA.VENDOR.15.4.0.AU284 Change-Id: I48b878f11b5d5343d0848446f0046125ba6addc5 Signed-off-by: Haritha Chintalapati From f758a7e10d8e53a8dc6949d1e77d17d5bfda9d76 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 3 Apr 2024 17:09:00 -0700 Subject: [PATCH 14/22] CAMX: Snap for drop 04/03/2024 mainline 1170 LA.VENDOR.15.4.0.AU291 Change-Id: If936342fa062310e0d7d0c026355b4b4cf2f60dc Signed-off-by: Haritha Chintalapati From 4c1a0231dcfcffcc627efe9193988e844450a789 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 4 Apr 2024 16:28:18 -0700 Subject: [PATCH 15/22] CAMX: Snap for drop 04/04/2024 mainline 1171 LA.VENDOR.15.4.0.AU291 Change-Id: Iedc47c859de8e5ca445d162662986e55c77d4947 Signed-off-by: Haritha Chintalapati From dda8a49a213c72a543b1462540bf179536d6cce3 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Fri, 5 Apr 2024 13:59:18 -0700 Subject: [PATCH 16/22] CAMX: Snap for drop 04/05/2024 mainline 1172 LA.VENDOR.15.4.0.AU291 Change-Id: Id7064d7e182bc0fd47d03f42eaec982842f5b6ea Signed-off-by: Haritha Chintalapati From a0db2cc2d314edc44487228334216967a154b74e Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 8 Apr 2024 23:42:11 -0700 Subject: [PATCH 17/22] CAMX: Snap for drop 04/08/2024 mainline 1173 LA.VENDOR.15.4.0.AU291 Change-Id: I6d0443b8065f09fd0cdfff32fc04a0c1cebab154 Signed-off-by: Haritha Chintalapati From 2487d232cfc63aba4f148aff43d08d77560fe5df Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 9 Apr 2024 19:28:03 -0700 Subject: [PATCH 18/22] CAMX: Snap for drop 04/09/2024 mainline 1174 LA.VENDOR.15.4.0.AU297 Change-Id: I5c87d7e7a82f45b089905ba25618c91ec1341579 Signed-off-by: Haritha Chintalapati From d97bf4e71c2a967f97e6658d9202e951258d60c2 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 10 Apr 2024 19:25:54 -0700 Subject: [PATCH 19/22] CAMX: Snap for drop 04/10/2024 mainline 1175 LA.VENDOR.15.4.0.AU297 Change-Id: I748d5ca78ff29a8bcd434c796e542029cbf18210 Signed-off-by: Haritha Chintalapati From 3ee0e60707d753d0466aeda412876b7e037e40b9 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Aakulu Date: Fri, 12 Apr 2024 01:49:21 -0700 Subject: [PATCH 20/22] ARM: dts: msm: Add new updated msm-id for camera Updated new msm-id for new variant devices under camera. And also updated change in board-id for selecting correct power grid. CRs-Fixed: 3773324 Change-Id: I3ca9e2b6879f414b88e367035aeb3887d466045a Signed-off-by: Lokesh Kumar Aakulu --- sun-camera-sensor-cdp.dts | 4 +++- sun-camera-sensor-mtp.dts | 6 ++++-- sun-camera-sensor-qrd.dts | 4 +++- sun-camera-sensor-rumi.dts | 4 +++- sun-camera.dts | 4 +++- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sun-camera-sensor-cdp.dts b/sun-camera-sensor-cdp.dts index 6d140a32..83f1e76b 100644 --- a/sun-camera-sensor-cdp.dts +++ b/sun-camera-sensor-cdp.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP/RCM"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp", "qcom,rcm", "qcom,sun-rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <1 0>, <21 0>, <0x20001 0>, <0x30001 0>, <0x40001 0>, <0x50001 0>, <0x60001 0>, <0x30015 0>, <0x40015 0>, <0x20015 0>; }; diff --git a/sun-camera-sensor-mtp.dts b/sun-camera-sensor-mtp.dts index 008f30e5..54da5b60 100644 --- a/sun-camera-sensor-mtp.dts +++ b/sun-camera-sensor-mtp.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <8 0>, <0x10108 0>, <0x20008 0>, <0x30008 0>, <0x40008 0>, <0x40108 0>, <0x50008 0>, <0x60008 0>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,board-id = <8 0>, <0x108 0>, <0x20008 0>, <0x30008 0>, <0x40008 0>, <0x40108 0>, <0x50008 0>, <0x60008 0>; }; diff --git a/sun-camera-sensor-qrd.dts b/sun-camera-sensor-qrd.dts index 95472e51..6222d3f3 100644 --- a/sun-camera-sensor-qrd.dts +++ b/sun-camera-sensor-qrd.dts @@ -12,6 +12,8 @@ / { 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x1000B 0>, <0x2000B 0>, <0x3000B 0>; }; diff --git a/sun-camera-sensor-rumi.dts b/sun-camera-sensor-rumi.dts index e0190d72..fa7b4141 100644 --- a/sun-camera-sensor-rumi.dts +++ b/sun-camera-sensor-rumi.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun RUMI"; compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <15 0>; }; diff --git a/sun-camera.dts b/sun-camera.dts index 80cb1c7f..8e77a5d3 100644 --- a/sun-camera.dts +++ b/sun-camera.dts @@ -11,6 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoC"; compatible = "qcom,sun"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0 0>; }; From f114740afe27b31edfbb0bb68fc6548b536441fc Mon Sep 17 00:00:00 2001 From: Pengfei Liu Date: Fri, 12 Apr 2024 01:49:25 -0700 Subject: [PATCH 21/22] ARM: dts: msm: Add new board id on sun qrd target Add new board id to support sensor, eeprom, flash Actuator node. CRs-Fixed: 3752824 Change-Id: Iccecbf205ae5c99621c3a83d35492c78975cd0d8 Signed-off-by: Pengfei Liu --- sun-camera-sensor-qrd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-camera-sensor-qrd.dts b/sun-camera-sensor-qrd.dts index 6222d3f3..5ee419f5 100644 --- a/sun-camera-sensor-qrd.dts +++ b/sun-camera-sensor-qrd.dts @@ -15,5 +15,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>, <0x2000B 0>, <0x3000B 0>; + qcom,board-id = <0x1000B 0>, <0x1001F 0>, <0x2000B 0>, <0x3000B 0>; }; From eeb10a7756dd299144259889fb85a82544dc87e4 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Fri, 12 Apr 2024 09:50:56 -0700 Subject: [PATCH 22/22] CAMX: Snap for drop 04/12/2024 mainline 1176 LA.VENDOR.15.4.0.AU297 86f8846 Merge 'ARM: dts: msm: Add new board id on sun qrd target' into camera-kernel.lnx.dev 59fe955 Merge 'ARM: dts: msm: Add new updated msm-id for camera' into camera-kernel.lnx.dev Change-Id: Ib6a224e40cec4c6e8b40ed13aed31af96372ee78 Signed-off-by: Haritha Chintalapati