From 5b4ebe14c85f019a90b6981725cfa49b5d7c6335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Barna=C5=9B?= Date: Fri, 3 Sep 2021 19:14:37 +0200 Subject: zephyr: fix batteries FET masks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix masks and values for charge and discharge FETs. Add missing charge FETs properties. BRANCH=main BUG=b:183544739 TEST=Verify if charge and discharge FETs work correctly Change-Id: I6e3abb9d8f03b9f6372e5bfb97a447b33ee4c7a9 Signed-off-by: Michał Barnaś Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3141599 Reviewed-by: Keith Short Commit-Queue: Keith Short --- zephyr/dts/bindings/battery/as3gwrc3ka,c235-41.yaml | 13 +++++++++++-- zephyr/dts/bindings/battery/lgc,ap16l8j.yaml | 10 +++++++++- zephyr/dts/bindings/battery/lgc,ap18c8k.yaml | 10 +++++++++- zephyr/dts/bindings/battery/murata,ap18c4k.yaml | 8 ++++++++ zephyr/dts/bindings/battery/panasonic,ap16l5j-009.yaml | 12 +++++++++++- zephyr/dts/bindings/battery/panasonic,ap16l5j.yaml | 12 +++++++++++- 6 files changed, 59 insertions(+), 6 deletions(-) diff --git a/zephyr/dts/bindings/battery/as3gwrc3ka,c235-41.yaml b/zephyr/dts/bindings/battery/as3gwrc3ka,c235-41.yaml index 94463eca89..c4359b29d2 100644 --- a/zephyr/dts/bindings/battery/as3gwrc3ka,c235-41.yaml +++ b/zephyr/dts/bindings/battery/as3gwrc3ka,c235-41.yaml @@ -17,12 +17,21 @@ properties: default: 0x00 ship_mode_reg_data: default: [ 0x10, 0x10 ] + # Documentation: b/150833879 + # Charging/Discharging FETs Status + # Register SBS_PackStatus_ACCESS (0x99) + # Bit-3: XDSG + # Bit-2: XCHG fet_reg_addr: default: 0x99 fet_reg_mask: - default: 0x0c + default: 0x08 fet_disconnect_val: - default: 0x0c + default: 0x08 + fet_cfet_mask: + default: 0x04 + fet_cfet_off_val: + default: 0x04 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/lgc,ap16l8j.yaml b/zephyr/dts/bindings/battery/lgc,ap16l8j.yaml index 546b33522a..e57cf48e24 100644 --- a/zephyr/dts/bindings/battery/lgc,ap16l8j.yaml +++ b/zephyr/dts/bindings/battery/lgc,ap16l8j.yaml @@ -17,12 +17,20 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] + # Documentation: b/148625782 + # ManufacturerAccess() 0x0054 OperationStatus + # CHG (Bit 2): CHG FET status (1 = Active 0 = Inactive) + # DSG (Bit 1): DSG FET status (1 = Active 0 = Inactive) fet_mfgacc_support: default: 1 fet_reg_mask: default: 0x0002 fet_disconnect_val: - default: 0x0 + default: 0x0000 + fet_cfet_mask: + default: 0x0004 + fet_cfet_off_val: + default: 0x0000 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/lgc,ap18c8k.yaml b/zephyr/dts/bindings/battery/lgc,ap18c8k.yaml index 727c510e04..b997004f3d 100644 --- a/zephyr/dts/bindings/battery/lgc,ap18c8k.yaml +++ b/zephyr/dts/bindings/battery/lgc,ap18c8k.yaml @@ -17,6 +17,10 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] + # Documentation: b/130608940 + # Command Code: 0x43 + # Bit 0 - DFET - Condition of D-FET ( 0=OFF, 1=ON ) + # Bit 1 - CFET - Condition of C-FET ( 0=OFF, 1=ON ) fet_mfgacc_support: default: 0 fet_reg_addr: @@ -24,7 +28,11 @@ properties: fet_reg_mask: default: 0x0001 fet_disconnect_val: - default: 0x0 + default: 0x0000 + fet_cfet_mask: + default: 0x0002 + fet_cfet_off_val: + default: 0x0000 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/murata,ap18c4k.yaml b/zephyr/dts/bindings/battery/murata,ap18c4k.yaml index c8301beaa3..ca028b82cb 100644 --- a/zephyr/dts/bindings/battery/murata,ap18c4k.yaml +++ b/zephyr/dts/bindings/battery/murata,ap18c4k.yaml @@ -17,6 +17,10 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] + # Documentation: b/130615670 + # Manufacturer Access 0x00 + # b14: Charging Disabled (0: Off, 1: On) + # b13: Discharging Disabled (0: Off, 1: On) fet_mfgacc_support: default: 0 fet_reg_addr: @@ -25,6 +29,10 @@ properties: default: 0x2000 fet_disconnect_val: default: 0x2000 + fet_cfet_mask: + default: 0x4000 + fet_cfet_off_val: + default: 0x4000 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/panasonic,ap16l5j-009.yaml b/zephyr/dts/bindings/battery/panasonic,ap16l5j-009.yaml index a198049881..5791549092 100644 --- a/zephyr/dts/bindings/battery/panasonic,ap16l5j-009.yaml +++ b/zephyr/dts/bindings/battery/panasonic,ap16l5j-009.yaml @@ -17,6 +17,12 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] + # Documentation: b/144674480 + # ManufacturerAccess() 0x00 + # Bit14 Discharge FET status + # Set - Discharge FET is ON, Reset - Discharge FET is OFF + # Bit15 Charge FET status + # Set - Charge FET is ON, Reset - Charge FET is OFF fet_mfgacc_support: default: 0 fet_reg_addr: @@ -24,7 +30,11 @@ properties: fet_reg_mask: default: 0x4000 fet_disconnect_val: - default: 0x0 + default: 0x0000 + fet_cfet_mask: + default: 0x8000 + fet_cfet_off_val: + default: 0x0000 # Battery info voltage_max: diff --git a/zephyr/dts/bindings/battery/panasonic,ap16l5j.yaml b/zephyr/dts/bindings/battery/panasonic,ap16l5j.yaml index fcfff98de1..fe0923dd87 100644 --- a/zephyr/dts/bindings/battery/panasonic,ap16l5j.yaml +++ b/zephyr/dts/bindings/battery/panasonic,ap16l5j.yaml @@ -17,6 +17,12 @@ properties: default: 0x3A ship_mode_reg_data: default: [ 0xC574, 0xC574 ] + # Documentation: b/144674480 + # ManufacturerAccess() 0x00 + # Bit14 Discharge FET status + # Set - Discharge FET is ON, Reset - Discharge FET is OFF + # Bit15 Charge FET status + # Set - Charge FET is ON, Reset - Charge FET is OFF fet_mfgacc_support: default: 0 fet_reg_addr: @@ -24,7 +30,11 @@ properties: fet_reg_mask: default: 0x4000 fet_disconnect_val: - default: 0x0 + default: 0x0000 + fet_cfet_mask: + default: 0x8000 + fet_cfet_off_val: + default: 0x0000 # Battery info voltage_max: -- cgit v1.2.1