[PATCH 1/7] dt-bindings: power: supply: pm8941-charger: add pm8226

[PATCH 1/7] dt-bindings: power: supply: pm8941-charger: add pm8226

[Luca Weiss]

The charger in PM8226 (used in MSM8226) is similar to the charger in
PM8941.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 .../devicetree/bindings/power/supply/qcom,pm8941-charger.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml b/Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml
index bc8904872d1b..caeff68c66d5 100644
--- a/Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml
+++ b/Documentation/devicetree/bindings/power/supply/qcom,pm8941-charger.yaml
@@ -11,7 +11,9 @@ maintainers:
 
 properties:
   compatible:
-    const: qcom,pm8941-charger
+    enum:
+      - qcom,pm8226-charger
+      - qcom,pm8941-charger
 
   reg:
     maxItems: 1
-- 
2.34.0

[PATCH 2/7] power: supply: qcom_smbb: support pm8226

[Luca Weiss]

PM8226 (used in MSM8226) has v1 smbb hardware and works fine with the
current driver.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 drivers/power/supply/qcom_smbb.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c
index 84cc9fba029d..bd50124eef9f 100644
--- a/drivers/power/supply/qcom_smbb.c
+++ b/drivers/power/supply/qcom_smbb.c
@@ -863,8 +863,8 @@ static int smbb_charger_probe(struct platform_device *pdev)
 	}
 
 	chg->revision += 1;
-	if (chg->revision != 2 && chg->revision != 3) {
-		dev_err(&pdev->dev, "v1 hardware not supported\n");
+	if (chg->revision != 1 && chg->revision != 2 && chg->revision != 3) {
+		dev_err(&pdev->dev, "v%d hardware not supported\n", chg->revision);
 		return -ENODEV;
 	}
 	dev_info(&pdev->dev, "Initializing SMBB rev %u", chg->revision);
@@ -1012,6 +1012,7 @@ static int smbb_charger_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id smbb_charger_id_table[] = {
+	{ .compatible = "qcom,pm8226-charger" },
 	{ .compatible = "qcom,pm8941-charger" },
 	{ }
 };
-- 
2.34.0

[PATCH 3/7] ARM: dts: qcom: pm8226: add smbb charger node

[Luca Weiss]

Add a node for the battery charger included in pm8226.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom-pm8226.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom-pm8226.dtsi
index dddb5150dfd7..666bc6350c50 100644
--- a/arch/arm/boot/dts/qcom-pm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-pm8226.dtsi
@@ -16,6 +16,29 @@ pwrkey@800 {
 			debounce = <15625>;
 			bias-pull-up;
 		};
+
+		smbb: charger@1000 {
+			compatible = "qcom,pm8226-charger";
+			reg = <0x1000>;
+			interrupts = <0x0 0x10 7 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x10 5 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x10 4 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x12 1 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x12 0 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x13 2 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x13 1 IRQ_TYPE_EDGE_BOTH>,
+				     <0x0 0x14 1 IRQ_TYPE_EDGE_BOTH>;
+			interrupt-names = "chg-done",
+					  "chg-fast",
+					  "chg-trkl",
+					  "bat-temp-ok",
+					  "bat-present",
+					  "chg-gone",
+					  "usb-valid",
+					  "dc-valid";
+
+			chg_otg: otg-vbus { };
+		};
 	};
 
 	pm8226_1: pm8226@1 {
-- 
2.34.0

[PATCH 4/7] ARM: dts: qcom: apq8026-lg-lenok: configure SMBB charger

[Luca Weiss]

Configure the SMBB charger according to the downstream kernel, some
values are rounded according to driver warnings.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
index b19522ad91a0..4e7a596d6101 100644
--- a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
@@ -209,6 +209,15 @@ &sdhc_1 {
 	pinctrl-0 = <&sdhc1_pin_a>;
 };
 
+&smbb {
+	qcom,fast-charge-safe-current = <450000>;
+	qcom,fast-charge-current-limit = <400000>;
+	qcom,fast-charge-safe-voltage = <4350000>;
+	qcom,fast-charge-high-threshold-voltage = <4350000>;
+	qcom,auto-recharge-threshold-voltage = <4240000>;
+	qcom,minimum-input-voltage = <4450000>;
+};
+
 &tlmm {
 	sdhc1_pin_a: sdhc1-pin-active {
 		clk {
-- 
2.34.0

[PATCH 5/7] dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible

[Luca Weiss]

Add a compatible for MSM8226 which also uses the USB HS PHY.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
index b3b75c1e6285..6814dccb390c 100644
--- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
@@ -9,6 +9,7 @@ PROPERTIES
                 following:
 
                         "qcom,usb-hs-phy-apq8064"
+                        "qcom,usb-hs-phy-msm8226"
                         "qcom,usb-hs-phy-msm8916"
                         "qcom,usb-hs-phy-msm8974"
 
-- 
2.34.0

[PATCH 6/7] ARM: dts: qcom: msm8226: add USB node

[Luca Weiss]

Add a node describing the MSM8226 USB controller and phy.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom-msm8226.dtsi | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi
index 7d48599502b3..103c0ab70814 100644
--- a/arch/arm/boot/dts/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8974.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/reset/qcom,gcc-msm8974.h>
 
 / {
 	#address-cells = <1>;
@@ -229,6 +230,44 @@ blsp1_i2c5: i2c@f9927000 {
 			#size-cells = <0>;
 		};
 
+		usb: usb@f9a55000 {
+			compatible = "qcom,ci-hdrc";
+			reg = <0xf9a55000 0x200>,
+			      <0xf9a55200 0x200>;
+			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_USB_HS_AHB_CLK>,
+				 <&gcc GCC_USB_HS_SYSTEM_CLK>;
+			clock-names = "iface", "core";
+			assigned-clocks = <&gcc GCC_USB_HS_SYSTEM_CLK>;
+			assigned-clock-rates = <75000000>;
+			resets = <&gcc GCC_USB_HS_BCR>;
+			reset-names = "core";
+			phy_type = "ulpi";
+			dr_mode = "otg";
+			hnp-disable;
+			srp-disable;
+			adp-disable;
+			ahb-burst-config = <0>;
+			phy-names = "usb-phy";
+			phys = <&usb_hs_phy>;
+			status = "disabled";
+			#reset-cells = <1>;
+
+			ulpi {
+				usb_hs_phy: phy {
+					compatible = "qcom,usb-hs-phy-msm8226",
+						     "qcom,usb-hs-phy";
+					#phy-cells = <0>;
+					clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>;
+					clock-names = "ref", "sleep";
+					resets = <&gcc GCC_USB2A_PHY_BCR>, <&usb 0>;
+					reset-names = "phy", "por";
+					qcom,init-seq = /bits/ 8 <0x0 0x44
+						0x1 0x68 0x2 0x24 0x3 0x13>;
+				};
+			};
+		};
+
 		gcc: clock-controller@fc400000 {
 			compatible = "qcom,gcc-msm8226";
 			reg = <0xfc400000 0x4000>;
-- 
2.34.0

[PATCH 7/7] ARM: dts: qcom: apq8026-lg-lenok: enable USB

[Luca Weiss]

Enable the USB nodes so it becomes usable on the device.

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
 arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
index 4e7a596d6101..1519544029e7 100644
--- a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
@@ -253,3 +253,15 @@ reset {
 		};
 	};
 };
+
+&usb {
+	status = "okay";
+	extcon = <&smbb>;
+	dr_mode = "peripheral";
+};
+
+&usb_hs_phy {
+	extcon = <&smbb>;
+	v1p8-supply = <&pm8226_l10>;
+	v3p3-supply = <&pm8226_l20>;
+};
-- 
2.34.0

Re: [PATCH 1/7] dt-bindings: power: supply: pm8941-charger: add pm8226

[Rob Herring]

On Thu, 18 Nov 2021 22:02:04 +0100, Luca Weiss wrote:
> The charger in PM8226 (used in MSM8226) is similar to the charger in
> PM8941.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
>  .../devicetree/bindings/power/supply/qcom,pm8941-charger.yaml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 5/7] dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible

[Rob Herring]

On Thu, 18 Nov 2021 22:02:08 +0100, Luca Weiss wrote:
> Add a compatible for MSM8226 which also uses the USB HS PHY.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
>  Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/7] dt-bindings: power: supply: pm8941-charger: add pm8226

[Sebastian Reichel]

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

Hi,

On Mon, Nov 29, 2021 at 05:11:00PM -0600, Rob Herring wrote:
> On Thu, 18 Nov 2021 22:02:04 +0100, Luca Weiss wrote:
> > The charger in PM8226 (used in MSM8226) is similar to the charger in
> > PM8941.
> > 
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > ---
> >  .../devicetree/bindings/power/supply/qcom,pm8941-charger.yaml | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> 
> Acked-by: Rob Herring <robh@kernel.org>

Thanks, queued.

-- Sebastian

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

Re: [PATCH 2/7] power: supply: qcom_smbb: support pm8226

[Sebastian Reichel]

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

Hi,

On Thu, Nov 18, 2021 at 10:02:05PM +0100, Luca Weiss wrote:
> PM8226 (used in MSM8226) has v1 smbb hardware and works fine with the
> current driver.
> 
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/qcom_smbb.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c
> index 84cc9fba029d..bd50124eef9f 100644
> --- a/drivers/power/supply/qcom_smbb.c
> +++ b/drivers/power/supply/qcom_smbb.c
> @@ -863,8 +863,8 @@ static int smbb_charger_probe(struct platform_device *pdev)
>  	}
>  
>  	chg->revision += 1;
> -	if (chg->revision != 2 && chg->revision != 3) {
> -		dev_err(&pdev->dev, "v1 hardware not supported\n");
> +	if (chg->revision != 1 && chg->revision != 2 && chg->revision != 3) {
> +		dev_err(&pdev->dev, "v%d hardware not supported\n", chg->revision);
>  		return -ENODEV;
>  	}
>  	dev_info(&pdev->dev, "Initializing SMBB rev %u", chg->revision);
> @@ -1012,6 +1012,7 @@ static int smbb_charger_remove(struct platform_device *pdev)
>  }
>  
>  static const struct of_device_id smbb_charger_id_table[] = {
> +	{ .compatible = "qcom,pm8226-charger" },
>  	{ .compatible = "qcom,pm8941-charger" },
>  	{ }
>  };
> -- 
> 2.34.0
> 

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

Re: (subset) [PATCH 1/7] dt-bindings: power: supply: pm8941-charger: add pm8226

[Bjorn Andersson]

On Thu, 18 Nov 2021 22:02:04 +0100, Luca Weiss wrote:
> The charger in PM8226 (used in MSM8226) is similar to the charger in
> PM8941.
> 
> 

Applied, thanks!

[3/7] ARM: dts: qcom: pm8226: add smbb charger node
      commit: b64192272cb65b0fddb97dba7c4f244452954a85
[4/7] ARM: dts: qcom: apq8026-lg-lenok: configure SMBB charger
      commit: 0bbcddc5f0365937ed53ebf7daa98134a6ebce8d
[5/7] dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible
      commit: c04421c68fd40ee33df87eea69c1a447b7985d0d
[6/7] ARM: dts: qcom: msm8226: add USB node
      commit: 1a34117f2e145f158c339ad9d296c0c1c42bc504
[7/7] ARM: dts: qcom: apq8026-lg-lenok: enable USB
      commit: f8565bd5404fcd6f87ee1e2d585541fbb457612d

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>