[PATCH 0/6] Enable PMI8998 charger on supported devices

[PATCH 0/6] Enable PMI8998 charger on supported devices

[Caleb Connolly]

These devices have been fairly heavily validated with the driver and are
known to not explode. Add the pmi8998_charger node to pmi8998 and enable
the charger for the OnePlus 6(T), PocoPhone F1 and SHIFT6mq.

The charger depends on the RRADC for the input voltage and current. The
RRADC was originally disabled by default, but there isn't really a need
for this as it's used by all devices. Let's take the opportunity to
enable it by default.

The associated driver and dt-bindings that this series depends on can be
found here:
https://lore.kernel.org/linux-arm-msm/20230524-pmi8998-charger-v8-0-b87ffcd9864d@linaro.org

---
Caleb Connolly (5):
      dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger
      arm64: dts: qcom: pmi8998: enable rradc by default
      arm64: dts: qcom: pmi8998: add charger node
      arm64: dts: qcom: sdm845-oneplus: enable pmi8998 charger
      arm64: dts: qcom: sdm845-shift-axolotl: enable pmi8998 charger

Joel Selvaraj (1):
      arm64: dts: qcom: sdm845-xiaomi-beryllium: enable pmi8998 charger

 .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml    |  1 +
 .../boot/dts/qcom/msm8998-oneplus-common.dtsi      |  4 ----
 arch/arm64/boot/dts/qcom/pmi8998.dtsi              | 22 ++++++++++++++++++++--
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts         |  4 ----
 .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi |  2 +-
 .../boot/dts/qcom/sdm845-oneplus-enchilada.dts     |  4 ++++
 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts |  4 ++++
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts  |  9 +++++++++
 .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi   | 15 ++++++++++++---
 9 files changed, 51 insertions(+), 14 deletions(-)
---
base-commit: cc08021afd54862446ef11fd683558a7e57cdc6a

// Caleb (they/them)

[PATCH 1/6] dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger

[Caleb Connolly]

Document the new pmi8998 charger bindings

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
index 36de335a33aa..44590dc112be 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
@@ -133,6 +133,7 @@ patternProperties:
     oneOf:
       - $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
       - $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
+      - $ref: /schemas/power/supply/qcom,pmi8998-charger.yaml#
 
   "gpio@[0-9a-f]+$":
     type: object

-- 
2.40.1

Re: [PATCH 1/6] dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger

[Rob Herring]

On Wed, 24 May 2023 18:38:52 +0100, Caleb Connolly wrote:
> Document the new pmi8998 charger bindings
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:

dtschema/dtc warnings/errors:
./Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/power/supply/qcom,pmi8998-charger.yaml

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20230524-pmi8998-charger-dts-v1-1-f9334afc4505@linaro.org

The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.

If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:

pip3 install dtschema --upgrade

Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.

Re: [PATCH 1/6] dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]

Hey Caleb,

On Wed, May 24, 2023 at 06:38:52PM +0100, Caleb Connolly wrote:
> Document the new pmi8998 charger bindings

This commit message looks a bit odd compared to the contents of the
diff. Did you forget to git add something?

Cheers,
Conor.

> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> index 36de335a33aa..44590dc112be 100644
> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
> @@ -133,6 +133,7 @@ patternProperties:
>      oneOf:
>        - $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
>        - $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
> +      - $ref: /schemas/power/supply/qcom,pmi8998-charger.yaml#
>  
>    "gpio@[0-9a-f]+$":
>      type: object
> 
> -- 
> 2.40.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 1/6] dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger

[Caleb Connolly]

On 24/05/2023 20:02, Conor Dooley wrote:
> Hey Caleb,
> 
> On Wed, May 24, 2023 at 06:38:52PM +0100, Caleb Connolly wrote:
>> Document the new pmi8998 charger bindings
> 
> This commit message looks a bit odd compared to the contents of the
> diff. Did you forget to git add something?

Well, it's not my finest commit message... The binding is in the series
linked in the cover letter (or [1]), I missed this addition when sending
that.

Would it be better to just squash this patch into the bindings and
respin the other series?

[1]:
https://lore.kernel.org/linux-arm-msm/20230524-pmi8998-charger-v8-0-b87ffcd9864d@linaro.org/
> 
> Cheers,
> Conor.
> 
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>>  Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> index 36de335a33aa..44590dc112be 100644
>> --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
>> @@ -133,6 +133,7 @@ patternProperties:
>>      oneOf:
>>        - $ref: /schemas/power/supply/qcom,pm8941-charger.yaml#
>>        - $ref: /schemas/power/supply/qcom,pm8941-coincell.yaml#
>> +      - $ref: /schemas/power/supply/qcom,pmi8998-charger.yaml#
>>  
>>    "gpio@[0-9a-f]+$":
>>      type: object
>>
>> -- 
>> 2.40.1
>>

-- 
// Caleb (they/them)

Re: [PATCH 1/6] dt-bindings: mfd: qcom,spmi-pmic: Document pmi8998 charger

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1210 bytes --]

On Wed, May 24, 2023 at 08:53:27PM +0100, Caleb Connolly wrote:
> On 24/05/2023 20:02, Conor Dooley wrote:
> > Hey Caleb,
> > 
> > On Wed, May 24, 2023 at 06:38:52PM +0100, Caleb Connolly wrote:
> >> Document the new pmi8998 charger bindings
> > 
> > This commit message looks a bit odd compared to the contents of the
> > diff. Did you forget to git add something?
> 
> Well, it's not my finest commit message... The binding is in the series
> linked in the cover letter (or [1]), I missed this addition when sending
> that.

Ya know, I opened the cover to check if there was something more
specific said about this & somehow did not notice it. I guess the commit
message & the bot report from Rob addled my brain. Sorry about that.

> Would it be better to just squash this patch into the bindings and
> respin the other series?

I dunno chief. I am always loathe to tell people how they should submit
stuff in these kind of scenarios, as I don't wanna send them up the
garden path. But, that said, if they don't go via the same tree you're
gonna end up creating the issue that the bot reported in whatever tree
applies this patch without the other. ¯\_(ツ)_/¯

Cheers,
Conor

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[PATCH 2/6] arm64: dts: qcom: pmi8998: enable rradc by default

[Caleb Connolly]

There is no need for the RRADC to be disabled by default,
lets just enable it by default and not clutter up DT.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi         | 4 ----
 arch/arm64/boot/dts/qcom/pmi8998.dtsi                        | 2 --
 arch/arm64/boot/dts/qcom/sdm845-db845c.dts                   | 4 ----
 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi          | 4 ----
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 4 ----
 5 files changed, 18 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
index 062d56c42385..68e634f8212c 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
@@ -279,10 +279,6 @@ vol_keys_default: vol-keys-state {
 	};
 };
 
-&pmi8998_rradc {
-	status = "okay";
-};
-
 &qusb2phy {
 	status = "okay";
 
diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
index ffe587f281d8..be6f60bfc26c 100644
--- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
@@ -23,8 +23,6 @@ pmi8998_rradc: adc@4500 {
 			compatible = "qcom,pmi8998-rradc";
 			reg = <0x4500>;
 			#io-channel-cells = <1>;
-
-			status = "disabled";
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index e14fe9bbb386..66087af02d74 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -649,10 +649,6 @@ led@5 {
 	};
 };
 
-&pmi8998_rradc {
-	status = "okay";
-};
-
 /* QUAT I2S Uses 4 I2S SD Lines for audio on LT9611 HDMI Bridge */
 &q6afedai {
 	dai@22 {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 5c384345c05d..55ee8dcf27c3 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -480,10 +480,6 @@ pinconf {
 	};
 };
 
-&pmi8998_rradc {
-	status = "okay";
-};
-
 &q6afedai {
 	qi2s@22 {
 		reg = <22>;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 5ed975cc6ecb..1915643f1c49 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -346,10 +346,6 @@ &pm8998_resin {
 	status = "okay";
 };
 
-&pmi8998_rradc {
-	status = "okay";
-};
-
 /* QUAT I2S Uses 1 I2S SD Line for audio on TAS2559/60 amplifiers */
 &q6afedai {
 	dai@22 {

-- 
2.40.1

Re: [PATCH 2/6] arm64: dts: qcom: pmi8998: enable rradc by default

[Konrad Dybcio]

On 24.05.2023 19:38, Caleb Connolly wrote:
> There is no need for the RRADC to be disabled by default,
> lets just enable it by default and not clutter up DT.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi         | 4 ----
>  arch/arm64/boot/dts/qcom/pmi8998.dtsi                        | 2 --
>  arch/arm64/boot/dts/qcom/sdm845-db845c.dts                   | 4 ----
>  arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi          | 4 ----
>  arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 4 ----
>  5 files changed, 18 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
> index 062d56c42385..68e634f8212c 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
> @@ -279,10 +279,6 @@ vol_keys_default: vol-keys-state {
>  	};
>  };
>  
> -&pmi8998_rradc {
> -	status = "okay";
> -};
> -
>  &qusb2phy {
>  	status = "okay";
>  
> diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> index ffe587f281d8..be6f60bfc26c 100644
> --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> @@ -23,8 +23,6 @@ pmi8998_rradc: adc@4500 {
>  			compatible = "qcom,pmi8998-rradc";
>  			reg = <0x4500>;
>  			#io-channel-cells = <1>;
> -
> -			status = "disabled";
>  		};
>  	};
>  
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> index e14fe9bbb386..66087af02d74 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
> @@ -649,10 +649,6 @@ led@5 {
>  	};
>  };
>  
> -&pmi8998_rradc {
> -	status = "okay";
> -};
> -
>  /* QUAT I2S Uses 4 I2S SD Lines for audio on LT9611 HDMI Bridge */
>  &q6afedai {
>  	dai@22 {
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index 5c384345c05d..55ee8dcf27c3 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -480,10 +480,6 @@ pinconf {
>  	};
>  };
>  
> -&pmi8998_rradc {
> -	status = "okay";
> -};
> -
>  &q6afedai {
>  	qi2s@22 {
>  		reg = <22>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index 5ed975cc6ecb..1915643f1c49 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -346,10 +346,6 @@ &pm8998_resin {
>  	status = "okay";
>  };
>  
> -&pmi8998_rradc {
> -	status = "okay";
> -};
> -
>  /* QUAT I2S Uses 1 I2S SD Line for audio on TAS2559/60 amplifiers */
>  &q6afedai {
>  	dai@22 {
> 

[PATCH 3/6] arm64: dts: qcom: pmi8998: add charger node

[Caleb Connolly]

Add a node for the smb2 charger hardware found on the pmi8998 pmic
following the DT bindings.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/pmi8998.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
index be6f60bfc26c..73f51451d21d 100644
--- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
@@ -9,6 +9,26 @@ pmi8998_lsid0: pmic@2 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
+		pmi8998_charger: charger@1000 {
+			compatible = "qcom,pmi8998-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 = <&pmi8998_rradc 3>,
+				      <&pmi8998_rradc 4>;
+			io-channel-names = "usbin_i", "usbin_v";
+
+			status = "disabled";
+		};
+
 		pmi8998_gpios: gpio@c000 {
 			compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
 			reg = <0xc000>;

-- 
2.40.1

Re: [PATCH 3/6] arm64: dts: qcom: pmi8998: add charger node

[Konrad Dybcio]

On 24.05.2023 19:38, Caleb Connolly wrote:
> Add a node for the smb2 charger hardware found on the pmi8998 pmic
> following the DT bindings.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/pmi8998.dtsi | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> index be6f60bfc26c..73f51451d21d 100644
> --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
> @@ -9,6 +9,26 @@ pmi8998_lsid0: pmic@2 {
>  		#address-cells = <1>;
>  		#size-cells = <0>;
>  
> +		pmi8998_charger: charger@1000 {
> +			compatible = "qcom,pmi8998-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 = <&pmi8998_rradc 3>,
> +				      <&pmi8998_rradc 4>;
> +			io-channel-names = "usbin_i", "usbin_v";
Are these hard-wired internally?

Konrad
> +
> +			status = "disabled";
> +		};
> +
>  		pmi8998_gpios: gpio@c000 {
>  			compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
>  			reg = <0xc000>;
> 

Re: [PATCH 3/6] arm64: dts: qcom: pmi8998: add charger node

[Caleb Connolly]

On 26/05/2023 20:46, Konrad Dybcio wrote:
> 
> 
> On 24.05.2023 19:38, Caleb Connolly wrote:
>> Add a node for the smb2 charger hardware found on the pmi8998 pmic
>> following the DT bindings.
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>>  arch/arm64/boot/dts/qcom/pmi8998.dtsi | 20 ++++++++++++++++++++
>>  1 file changed, 20 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>> index be6f60bfc26c..73f51451d21d 100644
>> --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>> @@ -9,6 +9,26 @@ pmi8998_lsid0: pmic@2 {
>>  		#address-cells = <1>;
>>  		#size-cells = <0>;
>>  
>> +		pmi8998_charger: charger@1000 {
>> +			compatible = "qcom,pmi8998-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 = <&pmi8998_rradc 3>,
>> +				      <&pmi8998_rradc 4>;
>> +			io-channel-names = "usbin_i", "usbin_v";
> Are these hard-wired internally?

Yes, features like AICL (automatic input current limiting - where the
device pulls more and more current until the input voltage drops) are
run autonomously and dont rely on the driver to tell the charger block
what the readings are.

This is only used to expose the voltage/current values to userspace via
the standard psy interface.
> 
> Konrad
>> +
>> +			status = "disabled";
>> +		};
>> +
>>  		pmi8998_gpios: gpio@c000 {
>>  			compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
>>  			reg = <0xc000>;
>>

-- 
// Caleb (they/them)

Re: [PATCH 3/6] arm64: dts: qcom: pmi8998: add charger node

[Konrad Dybcio]

On 26.05.2023 23:39, Caleb Connolly wrote:
> 
> 
> On 26/05/2023 20:46, Konrad Dybcio wrote:
>>
>>
>> On 24.05.2023 19:38, Caleb Connolly wrote:
>>> Add a node for the smb2 charger hardware found on the pmi8998 pmic
>>> following the DT bindings.
>>>
>>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>>> ---
>>>  arch/arm64/boot/dts/qcom/pmi8998.dtsi | 20 ++++++++++++++++++++
>>>  1 file changed, 20 insertions(+)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/pmi8998.dtsi b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>>> index be6f60bfc26c..73f51451d21d 100644
>>> --- a/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/pmi8998.dtsi
>>> @@ -9,6 +9,26 @@ pmi8998_lsid0: pmic@2 {
>>>  		#address-cells = <1>;
>>>  		#size-cells = <0>;
>>>  
>>> +		pmi8998_charger: charger@1000 {
>>> +			compatible = "qcom,pmi8998-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 = <&pmi8998_rradc 3>,
>>> +				      <&pmi8998_rradc 4>;
>>> +			io-channel-names = "usbin_i", "usbin_v";
>> Are these hard-wired internally?
> 
> Yes, features like AICL (automatic input current limiting - where the
> device pulls more and more current until the input voltage drops) are
> run autonomously and dont rely on the driver to tell the charger block
> what the readings are.
> 
> This is only used to expose the voltage/current values to userspace via
> the standard psy interface.
OK cool 

Konrad
>>
>> Konrad
>>> +
>>> +			status = "disabled";
>>> +		};
>>> +
>>>  		pmi8998_gpios: gpio@c000 {
>>>  			compatible = "qcom,pmi8998-gpio", "qcom,spmi-gpio";
>>>  			reg = <0xc000>;
>>>
> 

[PATCH 4/6] arm64: dts: qcom: sdm845-oneplus: enable pmi8998 charger

[Caleb Connolly]

Enable the pmi8998 charger on both devices, enabling charging speeds
above the default 500mA limit the bootloader sets.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi   | 4 ++++
 arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 4 ++++
 arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 55ee8dcf27c3..364adf416c4f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -480,6 +480,10 @@ pinconf {
 	};
 };
 
+&pmi8998_charger {
+	status = "okay";
+};
+
 &q6afedai {
 	qi2s@22 {
 		reg = <22>;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
index 6cdda971bb4b..623a826b18a3 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
@@ -51,6 +51,10 @@ max98927_codec: max98927@3a {
 	};
 };
 
+&pmi8998_charger {
+	monitored-battery = <&battery>;
+};
+
 &sound {
 	model = "OnePlus 6";
 	audio-routing =	"RX_BIAS", "MCLK",
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
index d82c0d4407f0..9471ada0d6ad 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
@@ -47,6 +47,10 @@ &sound {
 			"AMIC5", "MIC BIAS3";
 };
 
+&pmi8998_charger {
+	monitored-battery = <&battery>;
+};
+
 /*
  * The TFA9894 codec is currently unsupported.
  * We need to delete the node to allow the soundcard

-- 
2.40.1

[PATCH 5/6] arm64: dts: qcom: sdm845-shift-axolotl: enable pmi8998 charger

[Caleb Connolly]

Enable the PMI8998/smb2 charger, and denote the secondary SMB1355
charger which is used for parallel charging.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 0ad891348e0c..bb0f55c52a95 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -494,6 +494,10 @@ touchscreen@38 {
 	};
 };
 
+&i2c10 {
+	/* SMB1355@0x0C */
+};
+
 &ipa {
 	qcom,gsi-loader = "self";
 	memory-region = <&ipa_fw_mem>;
@@ -522,6 +526,11 @@ pinconf {
 	};
 };
 
+&pmi8998_charger {
+	status = "okay";
+	monitored-battery = <&battery>;
+};
+
 &pm8998_resin {
 	linux,code = <KEY_VOLUMEDOWN>;
 	status = "okay";

-- 
2.40.1

Re: [PATCH 5/6] arm64: dts: qcom: sdm845-shift-axolotl: enable pmi8998 charger

[Konrad Dybcio]

On 24.05.2023 19:38, Caleb Connolly wrote:
> Enable the PMI8998/smb2 charger, and denote the secondary SMB1355
> charger which is used for parallel charging.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> index 0ad891348e0c..bb0f55c52a95 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -494,6 +494,10 @@ touchscreen@38 {
>  	};
>  };
>  
> +&i2c10 {
> +	/* SMB1355@0x0C */
> +};
> +
>  &ipa {
>  	qcom,gsi-loader = "self";
>  	memory-region = <&ipa_fw_mem>;
> @@ -522,6 +526,11 @@ pinconf {
>  	};
>  };
>  
> +&pmi8998_charger {
> +	status = "okay";
> +	monitored-battery = <&battery>;
Status last, please

Konrad
> +};
> +
>  &pm8998_resin {
>  	linux,code = <KEY_VOLUMEDOWN>;
>  	status = "okay";
> 

[PATCH 6/6] arm64: dts: qcom: sdm845-xiaomi-beryllium: enable pmi8998 charger

[Caleb Connolly]

From: Joel Selvaraj <joelselvaraj.oss@gmail.com>

Enable the pmi8998 charger and define some basic battery properties.

Signed-off-by: Joel Selvaraj <joelselvaraj.oss@gmail.com>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 1915643f1c49..2060b31648fc 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -115,6 +115,14 @@ rmtfs_mem: memory@f6301000 {
 		};
 	};
 
+	battery: battery {
+		compatible = "simple-battery";
+
+		charge-full-design-microamp-hours = <4000000>;
+		voltage-min-design-microvolt = <3400000>;
+		voltage-max-design-microvolt = <4400000>;
+	};
+
 	vreg_s4a_1p8: vreg-s4a-1p8 {
 		compatible = "regulator-fixed";
 		regulator-name = "vreg_s4a_1p8";
@@ -341,6 +349,11 @@ &pmi8998_wled {
 	qcom,cabc;
 };
 
+&pmi8998_charger {
+	status = "okay";
+	monitored-battery = <&battery>;
+};
+
 &pm8998_resin {
 	linux,code = <KEY_VOLUMEDOWN>;
 	status = "okay";

-- 
2.40.1

Re: [PATCH 6/6] arm64: dts: qcom: sdm845-xiaomi-beryllium: enable pmi8998 charger

[Konrad Dybcio]

On 24.05.2023 19:38, Caleb Connolly wrote:
> From: Joel Selvaraj <joelselvaraj.oss@gmail.com>
> 
> Enable the pmi8998 charger and define some basic battery properties.
> 
> Signed-off-by: Joel Selvaraj <joelselvaraj.oss@gmail.com>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> index 1915643f1c49..2060b31648fc 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
> @@ -115,6 +115,14 @@ rmtfs_mem: memory@f6301000 {
>  		};
>  	};
>  
> +	battery: battery {
> +		compatible = "simple-battery";
> +
> +		charge-full-design-microamp-hours = <4000000>;
> +		voltage-min-design-microvolt = <3400000>;
> +		voltage-max-design-microvolt = <4400000>;
> +	};
> +
>  	vreg_s4a_1p8: vreg-s4a-1p8 {
>  		compatible = "regulator-fixed";
>  		regulator-name = "vreg_s4a_1p8";
> @@ -341,6 +349,11 @@ &pmi8998_wled {
>  	qcom,cabc;
>  };
>  
> +&pmi8998_charger {
> +	status = "okay";
> +	monitored-battery = <&battery>;
status last, please

Konrad
> +};
> +
>  &pm8998_resin {
>  	linux,code = <KEY_VOLUMEDOWN>;
>  	status = "okay";
>