5 files changed, 10 insertions, 60 deletions
diff --git a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml
index 83bd825236..d2fed4bfa6 100644
--- a/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml
+++ b/zephyr/dts/bindings/battery/battery-fuel-gauge.yaml
@@ -5,6 +5,8 @@
 description: |
    Battery fuel gauge parameters
 
+compatible: "battery-fuel-gauge"
+
 properties:
    manuf_name:
       description: |
diff --git a/zephyr/dts/bindings/battery/battery-info.yaml b/zephyr/dts/bindings/battery/battery-info.yaml
index c188616260..54e81cedeb 100644
--- a/zephyr/dts/bindings/battery/battery-info.yaml
+++ b/zephyr/dts/bindings/battery/battery-info.yaml
@@ -8,6 +8,8 @@ description:
    Current is in milliamperes
    Temperature is in Celsius degrees
 
+compatible: "battery-info"
+
 properties:
    voltage_max:
       description: |
diff --git a/zephyr/dts/bindings/battery/battery-smart.yaml b/zephyr/dts/bindings/battery/battery-smart.yaml
index 5992226291..1d0c9786eb 100644
--- a/zephyr/dts/bindings/battery/battery-smart.yaml
+++ b/zephyr/dts/bindings/battery/battery-smart.yaml
@@ -28,7 +28,6 @@ properties:
          - "dynapack,cosmx_gh02047xl"
          - "dynapack,c140254"
          - "ganfeng,7c01"
-         - "ganfeng,sg20"
          - "getac,bq40z50-R3-S3"
          - "getac,bq40z50-R3-S2"
          - "lgc,ac17a8m"
diff --git a/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml b/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml
index 7faceedb11..5e64834f15 100644
--- a/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml
+++ b/zephyr/dts/bindings/battery/cosmx,ap20cbl-2.yaml
@@ -17,22 +17,22 @@ properties:
       default: 0x3A
    ship_mode_reg_data:
       default: [ 0xC574, 0xC574 ]
-   # Documentation: b/257860663#comment7
+   # Documentation: b/243772306
    # Manufacturer Access 0x00
-   # b14: Charging Disabled (0: Off, 1: On)
-   # b13: Discharging Disabled (0: Off, 1: On)
+   # b14: C-FET Status (0: Off, 1: On)
+   # b15: D-FET Status (0: Off, 1: On)
    fet_mfgacc_support:
       default: 1
    fet_reg_addr:
       default: 0x0
    fet_reg_mask:
-      default: 0x2000
+      default: 0x8000
    fet_disconnect_val:
-      default: 0x2000
+      default: 0x0000
    fet_cfet_mask:
       default: 0x4000
    fet_cfet_off_val:
-      default: 0x4000
+      default: 0x0000
 
    # Battery info
    voltage_max:
diff --git a/zephyr/dts/bindings/battery/ganfeng,sg20.yaml b/zephyr/dts/bindings/battery/ganfeng,sg20.yaml
deleted file mode 100644
index 6e8f558b00..0000000000
--- a/zephyr/dts/bindings/battery/ganfeng,sg20.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-description: "Ganfeng SG20"
-compatible: "ganfeng,sg20"
-
-include: battery-smart.yaml
-
-properties:
-   enum-name:
-      type: string
-      default: "ganfeng,sg20"
-
-   # Fuel gauge
-   manuf_name:
-      default: "Ganfeng"
-   device_name:
-      default: "SG20"
-   ship_mode_reg_addr:
-      default: 0x00
-   ship_mode_reg_data:
-      default: [ 0x0010, 0x0010 ]
-   fet_mfgacc_support:
-      default: 0
-   fet_reg_addr:
-      default: 0x43
-   fet_reg_mask:
-      default: 0x0001
-   fet_disconnect_val:
-      default: 0x0000
-   fet_cfet_mask:
-      default: 0x0002
-   fet_cfet_off_val:
-      default: 0x0000
-
-   # Battery info
-   voltage_max:
-      default: 8700
-   voltage_normal:
-      default: 7600
-   voltage_min:
-      default: 6000
-   precharge_current:
-      default: 256
-   start_charging_min_c:
-      default: 0
-   start_charging_max_c:
-      default: 50
-   charging_min_c:
-      default: 0
-   charging_max_c:
-      default: 60
-   discharging_min_c:
-      default: -20
-   discharging_max_c:
-      default: 60