arm64: dts: qcom: sdm429-lenovo-tbx505x: Enable charger and fuel gauge

Documentation/devicetree/bindings/power/supply/battery.yaml

@@ -93,6 +93,16 @@ properties:
   factory-internal-resistance-micro-ohms:
     description: battery factory internal resistance
 
+  id-resistor-ohms:
+    maxItems: 1
+    description: |
+      Resistance of the identification resistor built into the pack, on boards
+      where more than one battery may be fitted and a charger can tell them
+      apart by measuring it. Naming it here lets a driver refuse to apply this
+      battery's limits to a pack that is demonstrably a different one; how the
+      resistance is measured is a property of the board and of the charger, not
+      of the cell.
+
   resistance-temp-table:
     $ref: /schemas/types.yaml#/definitions/uint32-matrix
     items:

Documentation/devicetree/bindings/power/supply/qcom,pmi8998-charger.yaml

@@ -4,16 +4,23 @@
 $id: http://devicetree.org/schemas/power/supply/qcom,pmi8998-charger.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm PMI8998/PM660 Switch-Mode Battery Charger "2"
+title: Qualcomm Switch-Mode Battery Charger "2" and "5"
 
 maintainers:
   - Casey Connolly <casey.connolly@linaro.org>
 
+description: |
+  The charger peripheral of a Qualcomm PMIC, in either of two generations:
+  SMB2 on the PMI8998 and PM660, and SMB5 on the PMI632. They differ in the
+  register layout and in which analog channels the PMIC routes, not in the
+  shape of this binding.
+
 properties:
   compatible:
     enum:
       - qcom,pmi8998-charger
       - qcom,pm660-charger
+      - qcom,pmi632-charger
 
   reg:
     maxItems: 1
@@ -29,17 +36,95 @@ properties:
       - const: usbin-icl-change
 
   io-channels:
+    minItems: 2
     items:
       - description: USB in current in uA
       - description: USB in voltage in uV
+      - description: Battery voltage in uV
+      - description: Battery thermistor, as a raw ADC code
+      - description: Battery ID resistor divider voltage in uV
 
   io-channel-names:
+    minItems: 2
     items:
       - const: usbin_i
       - const: usbin_v
+      - const: vbat
+      - const: bat_therm
+      - const: bat_id
 
   monitored-battery: true
 
+  qcom,batt-id-pullup-ohms:
+    maxItems: 1
+    description: |
+      Resistance of the pull-up from the PMIC reference to the BAT_ID net, in
+      ohms. Together with the voltage read on the bat_id channel this gives the
+      resistance of the identification resistor inside the pack, which is
+      compared against the id-resistor-ohms of the monitored battery. Describe
+      it only on boards that route BAT_ID.
+
+  qcom,batt-id-tolerance-percent:
+    maxItems: 1
+    description: |
+      How far, as a percentage, the resistance measured through that divider
+      may differ from the monitored battery's id-resistor-ohms and still count
+      as the same pack. The tolerance belongs here rather than to the cell
+      because it has to cover the divider and the ADC as well as the resistor
+      itself.
+
+  qcom,auto-recharge-microvolt:
+    description: |
+      Battery voltage, in microvolts, below which a finished charge is started
+      again. Must be below the monitored battery's
+      constant-charge-voltage-max-microvolt. Absent, the comparator keeps
+      whatever threshold it powers up with.
+
+  qcom,jeita-hard-thresholds:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 2
+    maxItems: 2
+    description: |
+      The pair of raw BAT_THERM ADC codes { cold, hot } outside which charging
+      stops outright, cold first. These are codes rather than temperatures
+      because the comparators take codes, and which code a temperature produces
+      depends on this PMIC's ADC full scale and on the board's pull-up as much
+      as on the cell - which is also why they are described here and not on the
+      battery.
+
+  qcom,jeita-soft-thresholds:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 2
+    maxItems: 2
+    description: |
+      The pair of raw BAT_THERM ADC codes { cold, hot } inside which the pack
+      may be charged at full current, in the same units and for the same reason
+      as qcom,jeita-hard-thresholds. Between a soft and a hard threshold the
+      charge current is reduced instead of stopped.
+
+  qcom,jeita-soft-fcc-microamp:
+    minItems: 2
+    maxItems: 2
+    description: |
+      Fast-charge current, in microamperes, to be left with in the cool and the
+      warm soft zone, in that order. The hardware subtracts a fixed offset from
+      whatever current is programmed, so describing the wanted result rather
+      than the offset keeps the property meaningful when the current changes.
+
+  qcom,thermal-mitigation:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 2
+    maxItems: 16
+    description: |
+      Fast-charge current limit, in microamperes, for each state of the cooling
+      device the charger registers. The first entry is cooling state 0 and must
+      be the most permissive; entries must not increase. A thermal zone reduces
+      the charge current by requesting a higher state, so state 0 is what the
+      charger falls back to when nothing is throttling it.
+
+  '#cooling-cells':
+    const: 2
+
 required:
   - compatible
   - reg
@@ -80,3 +165,37 @@ examples:
         monitored-battery = <&battery>;
       };
     };
+
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/iio/qcom,spmi-vadc.h>
+
+    pmic {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      charger@1000 {
+        compatible = "qcom,pmi632-charger";
+        reg = <0x1000>;
+
+        interrupts = <0x2 0x13 0x4 IRQ_TYPE_EDGE_BOTH>,
+                     <0x2 0x12 0x2 IRQ_TYPE_EDGE_BOTH>,
+                     <0x2 0x16 0x1 IRQ_TYPE_EDGE_RISING>,
+                     <0x2 0x13 0x6 IRQ_TYPE_EDGE_RISING>;
+        interrupt-names = "usb-plugin", "bat-ov", "wdog-bark", "usbin-icl-change";
+
+        io-channels = <&pmi632_adc ADC5_USB_IN_I>,
+                      <&pmi632_adc ADC5_USB_IN_V_16>,
+                      <&pmi632_adc ADC5_VBAT_SNS>,
+                      <&pmi632_adc ADC5_BAT_THERM_100K_PU>,
+                      <&pmi632_adc ADC5_BAT_ID_100K_PU>;
+        io-channel-names = "usbin_i", "usbin_v", "vbat",
+                           "bat_therm", "bat_id";
+
+        monitored-battery = <&battery>;
+        qcom,batt-id-pullup-ohms = <100000>;
+        qcom,thermal-mitigation = <2000000 1500000 1000000 500000>;
+
+        #cooling-cells = <2>;
+      };
+    };

arch/arm64/boot/dts/qcom/pmi632.dtsi

@@ -5,6 +5,7 @@
 
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/spmi/spmi.h>
 
 / {
@@ -50,6 +51,114 @@
 			status = "disabled";
 		};
 
+		pmi632_charger: charger@1000 {
+			compatible = "qcom,pmi632-charger";
+			reg = <0x1000>;
+
+			/*
+			 * The charger's interrupt sources, in the order the
+			 * downstream qpnp-smb5 device tree gives them. SMB5
+			 * renumbered the USB peripheral against SMB2 - vashdn
+			 * and revi-change are new, which pushes src-change to
+			 * 6 and icl-change to 7 - so the indices here are not
+			 * the pmi8998 ones they were first copied from.
+			 */
+			interrupts = <0x2 0x13 0x4 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x12 0x2 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x16 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x13 0x7 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x48 0x4 IRQ_TYPE_EDGE_RISING>,
+				     /* CHGR */
+				     <0x2 0x10 0x0 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x2 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x3 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x4 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x5 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x6 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x10 0x7 IRQ_TYPE_EDGE_RISING>,
+				     /* DCDC */
+				     <0x2 0x11 0x0 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x11 0x1 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x11 0x2 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x11 0x3 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x11 0x4 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x11 0x5 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x11 0x6 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x11 0x7 IRQ_TYPE_EDGE_BOTH>,
+				     /* BATIF */
+				     <0x2 0x12 0x0 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x12 0x3 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x12 0x4 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x12 0x5 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x12 0x6 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x12 0x7 IRQ_TYPE_EDGE_BOTH>,
+				     /* USB */
+				     <0x2 0x13 0x0 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x13 0x1 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x13 0x2 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x13 0x3 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x13 0x5 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x13 0x6 IRQ_TYPE_EDGE_RISING>,
+				     /* MISC */
+				     <0x2 0x16 0x0 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x16 0x2 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x16 0x3 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x16 0x4 IRQ_TYPE_EDGE_BOTH>,
+				     <0x2 0x16 0x5 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x16 0x6 IRQ_TYPE_EDGE_RISING>,
+				     <0x2 0x16 0x7 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "usb-plugin",
+					  "bat-ov",
+					  "wdog-bark",
+					  "usbin-icl-change",
+					  "good-ocv",
+					  "chgr-error",
+					  "chg-state-change",
+					  "step-chg-state-change",
+					  "step-chg-soc-update-fail",
+					  "step-chg-soc-update-req",
+					  "fg-fvcal-qualified",
+					  "vph-alarm",
+					  "vph-drop-prechg",
+					  "otg-fail",
+					  "otg-oc-disable-sw",
+					  "otg-oc-hiccup",
+					  "bsm-active",
+					  "high-duty-cycle",
+					  "input-current-limiting",
+					  "concurrent-mode-disable",
+					  "switcher-power-ok",
+					  "bat-temp",
+					  "bat-low",
+					  "bat-therm-or-id-missing",
+					  "bat-terminal-missing",
+					  "buck-oc",
+					  "vph-ov",
+					  "usbin-collapse",
+					  "usbin-vashdn",
+					  "usbin-uv",
+					  "usbin-ov",
+					  "usbin-revi-change",
+					  "usbin-src-change",
+					  "wdog-snarl",
+					  "aicl-fail",
+					  "aicl-done",
+					  "smb-en",
+					  "imp-trigger",
+					  "temp-change",
+					  "temp-change-smb";
+
+			io-channels = <&pmi632_adc ADC5_USB_IN_I>,
+				      <&pmi632_adc ADC5_USB_IN_V_16>,
+				      <&pmi632_adc ADC5_VBAT_SNS>,
+				      <&pmi632_adc ADC5_BAT_THERM_100K_PU>;
+			io-channel-names = "usbin_i", "usbin_v", "vbat",
+					   "bat_therm";
+
+			status = "disabled";
+		};
+
 		pmi632_typec: typec@1500 {
 			compatible = "qcom,pmi632-typec";
 			reg = <0x1500>;
@@ -125,6 +234,14 @@
 				label = "chg_temp";
 			};
 
+			channel@4a {
+				reg = <ADC5_BAT_THERM_100K_PU>;
+				qcom,hw-settle-time = <200>;
+				qcom,pre-scaling = <1 1>;
+				qcom,ratiometric;
+				label = "bat_therm";
+			};
+
 			channel@4b {
 				reg = <ADC5_BAT_ID_100K_PU>;
 				qcom,hw-settle-time = <200>;
@@ -205,5 +322,11 @@
 			reg = <0x5700>;
 			status = "disabled";
 		};
+
+		pmi632_flash: led-controller@d300 {
+			compatible = "qcom,pmi632-flash-led", "qcom,spmi-flash-led";
+			reg = <0xd300>;
+			status = "disabled";
+		};
 	};
 };