From 15517dcbfc86939010e70635224eda5ccd52c44a Mon Sep 17 00:00:00 2001 From: liuyc20 Date: Tue, 21 Dec 2021 16:40:42 +0800 Subject: [PATCH] arm/dts: cypfr add 5mohm battery parameter for DVT2 device 1.after DVT2 devices, board will use 5mohm resistance for FG 2.be compatible with DVT1/EVT device 3.reomve SCUD battery parameter, Change-Id: I1b99eb2c53d512d81a271eea4c881782e4c2825a Signed-off-by: liuyc20 Reviewed-on: https://gerrit.mot.com/2150743 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- ... => CW_jd50-atl-5000mah-10mohm-cypfr.dtsi} | 0 ...i => CW_jd50-atl-5000mah-5mohm-cypfr.dtsi} | 25 ++++++++++--------- qcom/blair-cypfr-common-overlay.dtsi | 4 +-- qcom/blair-cypfr-dvt2-overlay.dts | 5 ++++ qcom/blair-cypfr-evb-overlay.dts | 3 +++ qcom/blair-cypfr-evt-overlay.dts | 4 +++ 6 files changed, 26 insertions(+), 15 deletions(-) rename qcom/bat_setting/{CW_jd50-atl-5000mah.dtsi => CW_jd50-atl-5000mah-10mohm-cypfr.dtsi} (100%) rename qcom/bat_setting/{CW_jd50-scud-5000mah.dtsi => CW_jd50-atl-5000mah-5mohm-cypfr.dtsi} (57%) diff --git a/qcom/bat_setting/CW_jd50-atl-5000mah.dtsi b/qcom/bat_setting/CW_jd50-atl-5000mah-10mohm-cypfr.dtsi similarity index 100% rename from qcom/bat_setting/CW_jd50-atl-5000mah.dtsi rename to qcom/bat_setting/CW_jd50-atl-5000mah-10mohm-cypfr.dtsi diff --git a/qcom/bat_setting/CW_jd50-scud-5000mah.dtsi b/qcom/bat_setting/CW_jd50-atl-5000mah-5mohm-cypfr.dtsi similarity index 57% rename from qcom/bat_setting/CW_jd50-scud-5000mah.dtsi rename to qcom/bat_setting/CW_jd50-atl-5000mah-5mohm-cypfr.dtsi index 2850ac2a4e65..f5b7981f7582 100644 --- a/qcom/bat_setting/CW_jd50-scud-5000mah.dtsi +++ b/qcom/bat_setting/CW_jd50-atl-5000mah-5mohm-cypfr.dtsi @@ -10,17 +10,18 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See http://www.gnu.org/licenses/gpl-2.0.html for more details. */ -jd50-scud-5000mah { - serialnum = "SB18C77226"; +jd50-atl-5000mah { + serialnum = "SB18C77591"; fcc_design = <5000>; - config_profile_info = [5A 00 00 00 00 00 00 00 - A5 B1 B5 CE C3 C2 97 58 - 31 FF FF E3 92 80 63 58 - 4F 4D 4A 86 F0 DC 0D D2 - D2 D1 D1 D1 CF CC BC DC - B0 C3 C8 AA 96 89 80 71 - 68 64 73 8F A3 86 65 60 - 20 00 57 10 02 B0 74 00 - 00 00 64 24 D3 79 00 00 - 00 00 00 00 00 00 00 5F ]; + ui_full = <99>; + config_profile_info = [52 00 00 00 00 00 00 00 + A0 B2 BF CB C3 C2 96 59 + 2F FF FF DB A6 8D 74 60 + 55 52 4D 8D FD DC 02 CF + CF D2 D1 D1 D0 CD C8 CD + C1 C0 C5 AD 95 8A 81 74 + 62 62 73 8F A7 87 5F 8D + 20 00 AB 10 02 A0 76 00 + 00 00 64 20 C3 7C 00 00 + 00 00 00 00 00 00 00 1C]; }; diff --git a/qcom/blair-cypfr-common-overlay.dtsi b/qcom/blair-cypfr-common-overlay.dtsi index e1b28be37a8f..79a9a4b92390 100644 --- a/qcom/blair-cypfr-common-overlay.dtsi +++ b/qcom/blair-cypfr-common-overlay.dtsi @@ -516,14 +516,12 @@ &qupv3_se8_i2c { status = "okay"; - cw2217@64 { + cw2217: cw2217@64 { compatible = "cellwise,cw2217"; reg = <0x64>; status = "okay"; df-serialnum = "SB18C77591"; - #include "bat_setting/CW_jd50-scud-5000mah.dtsi" - #include "bat_setting/CW_jd50-atl-5000mah.dtsi" }; }; diff --git a/qcom/blair-cypfr-dvt2-overlay.dts b/qcom/blair-cypfr-dvt2-overlay.dts index 4edfb293619c..3459d046517f 100644 --- a/qcom/blair-cypfr-dvt2-overlay.dts +++ b/qcom/blair-cypfr-dvt2-overlay.dts @@ -25,3 +25,8 @@ &sgm7220 { sgm7220,pwr_gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>; }; + +&cw2217 { + sense_r_mohm = <5>; + #include "bat_setting/CW_jd50-atl-5000mah-5mohm-cypfr.dtsi" +}; diff --git a/qcom/blair-cypfr-evb-overlay.dts b/qcom/blair-cypfr-evb-overlay.dts index 2139c2e2c73f..9fc8108b92c1 100644 --- a/qcom/blair-cypfr-evb-overlay.dts +++ b/qcom/blair-cypfr-evb-overlay.dts @@ -22,3 +22,6 @@ qcom,board-id = <0x4B 0xA100>; }; +&cw2217 { + #include "bat_setting/CW_jd50-atl-5000mah-10mohm-cypfr.dtsi" +}; diff --git a/qcom/blair-cypfr-evt-overlay.dts b/qcom/blair-cypfr-evt-overlay.dts index 6eb3a60a95e7..7f3b0629c6b4 100644 --- a/qcom/blair-cypfr-evt-overlay.dts +++ b/qcom/blair-cypfr-evt-overlay.dts @@ -25,3 +25,7 @@ &sgm7220 { sgm7220,pwr_gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>; }; + +&cw2217 { + #include "bat_setting/CW_jd50-atl-5000mah-10mohm-cypfr.dtsi" +};