mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Aren Moynihan <aren@peacevolution.org>
To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: "Aidan MacDonald" <aidanmacdonald.0x0@gmail.com>,
	"Ondřej Jirman" <megi@xff.cz>,
	"Aren Moynihan" <aren@peacevolution.org>,
	"Chen-Yu Tsai" <wens@csie.org>,
	"Quentin Schulz" <quentin.schulz@bootlin.com>,
	"Sebastian Reichel" <sre@kernel.org>
Subject: [PATCH 3/3] power: supply: axp20x_usb_power: set input current limit in probe
Date: Sat, 20 Jan 2024 20:40:04 -0500	[thread overview]
Message-ID: <20240121014057.1042466-7-aren@peacevolution.org> (raw)
In-Reply-To: <20240121014057.1042466-1-aren@peacevolution.org>

axp803 sets the current limit to 3A by default if it doesn't detect a
battery. The datasheet says that reg 0x2D bit 6 is used to indicate
first power on status. According to it, if that bit is 0 and the
battery is not detected, it will set the input current limit to 3A,
however setting that bit to 1 doesn't to prevent the pmic from setting
the current limit to 3A.

Fixes: c279adafe6ab ("power: supply: axp20x_usb_power: add support for AXP813")

Signed-off-by: Aren Moynihan <aren@peacevolution.org>
---
I'm not sure if the pmic simply ignores the first power on field, or if
it needs to be set in a specific way / at a specific time. I tried
setting it in arm-trusted-firmware, and the pmic still set the input
current limit to 3A.

The datasheet for axp813 says it has the same first power on bit, but I
don't have hardware to test if it behaves the same way. This driver uses
the same platform data for axp803 and axp813.

 drivers/power/supply/axp20x_usb_power.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
index 5656f6e57d54..95b136ee20f2 100644
--- a/drivers/power/supply/axp20x_usb_power.c
+++ b/drivers/power/supply/axp20x_usb_power.c
@@ -52,6 +52,7 @@ struct axp_data {
 	const int			*curr_lim_table;
 	int				input_curr_lim_table_size;
 	const int			*input_curr_lim_table;
+	int				force_input_curr_lim;
 	struct reg_field		curr_lim_fld;
 	struct reg_field		input_curr_lim_fld;
 	struct reg_field		vbus_valid_bit;
@@ -599,6 +600,7 @@ static const struct axp_data axp813_data = {
 	.input_curr_lim_table_size = ARRAY_SIZE(axp_813_usb_input_curr_lim_table),
 	.input_curr_lim_table = axp_813_usb_input_curr_lim_table,
 	.input_curr_lim_fld = REG_FIELD(AXP22X_CHRG_CTRL3, 4, 7),
+	.force_input_curr_lim = 500000,
 	.usb_bc_en_bit	= REG_FIELD(AXP288_BC_GLOBAL, 0, 0),
 	.usb_bc_det_fld = REG_FIELD(AXP288_BC_DET_STAT, 5, 7),
 	.vbus_disable_bit = REG_FIELD(AXP20X_VBUS_IPSOUT_MGMT, 7, 7),
@@ -786,6 +788,17 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
 			return ret;
 	}
 
+	if (power->axp_data->force_input_curr_lim) {
+		/*
+		 * Certain chips set the input current limit to 3A when there is
+		 * no battery connected. Normally the default is 500mA.
+		 */
+		ret = axp20x_usb_power_set_input_current_limit(power,
+				power->axp_data->force_input_curr_lim);
+		if (ret)
+			return ret;
+	}
+
 	if (power->usb_bc_en_bit) {
 		/* Enable USB Battery Charging specification detection */
 		ret = regmap_field_write(power->usb_bc_en_bit, 1);
-- 
2.43.0


  parent reply	other threads:[~2024-01-21  1:46 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-21  1:39 [PATCH 0/3] power: supply: axp20x_usb_power: prepare for external power delivery negotiation Aren Moynihan
2024-01-21  1:40 ` [PATCH 1/3] power: supply: axp20x_usb_power: add input current limit Aren Moynihan
2024-01-21 11:38   ` Ondřej Jirman
2024-01-23  1:50     ` Aren
2024-01-21 15:25   ` Chen-Yu Tsai
2024-01-23  0:52     ` Aren
2024-01-21  1:40 ` [PATCH 2/3] power: supply: axp20x_usb_power: enable usb_type reporting Aren Moynihan
2024-01-21 11:55   ` Ondřej Jirman
2024-01-23  2:41     ` Aren
2024-01-21  1:40 ` Aren Moynihan [this message]
2024-01-21 11:08   ` [PATCH 3/3] power: supply: axp20x_usb_power: set input current limit in probe Ondřej Jirman
2024-01-23  1:40     ` Aren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240121014057.1042466-7-aren@peacevolution.org \
    --to=aren@peacevolution.org \
    --cc=aidanmacdonald.0x0@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=megi@xff.cz \
    --cc=quentin.schulz@bootlin.com \
    --cc=sre@kernel.org \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®