From: Mark Brown <broonie@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Markus Reichl <m.reichl@fivetechno.de>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH 6/8] regulator: mp8859: Support status and error readback
Date: Sun, 25 Feb 2024 14:59:32 +0000 [thread overview]
Message-ID: <20240225-regulator-mp8859-v1-6-68ee2c839ded@kernel.org> (raw)
In-Reply-To: <20240225-regulator-mp8859-v1-0-68ee2c839ded@kernel.org>
The MP8859 can report if it is in regulation and detect over temperature
conditions, report this information via the relevant regulator API
calls.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
drivers/regulator/mp8859.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/drivers/regulator/mp8859.c b/drivers/regulator/mp8859.c
index 87ef34875be1..fc1636d69bca 100644
--- a/drivers/regulator/mp8859.c
+++ b/drivers/regulator/mp8859.c
@@ -39,6 +39,11 @@
#define MP8859_DISCHG_EN_MASK 0x10
#define MP8859_MODE_MASK 0x08
+#define MP8859_PG_MASK 0x80
+#define MP8859_OTP_MASK 0x40
+#define MP8859_OTW_MASK 0x20
+#define MP8859_CC_CV_MASK 0x10
+
static int mp8859_set_voltage_sel(struct regulator_dev *rdev, unsigned int sel)
{
int ret;
@@ -112,6 +117,58 @@ static int mp8859_set_mode(struct regulator_dev *rdev, unsigned int mode)
MP8859_MODE_MASK, val);
}
+static int mp8859_get_status(struct regulator_dev *rdev)
+{
+ unsigned int val;
+ int ret;
+
+ /* Output status is only meaingful when enabled */
+ ret = regmap_read(rdev->regmap, MP8859_CTL1_REG, &val);
+ if (ret != 0)
+ return ret;
+ if (!(val & MP8859_ENABLE_MASK))
+ return REGULATOR_STATUS_UNDEFINED;
+
+ ret = regmap_read(rdev->regmap, MP8859_STATUS_REG, &val);
+ if (ret != 0)
+ return ret;
+
+ if (val & MP8859_PG_MASK)
+ return REGULATOR_STATUS_ON;
+ else
+ return REGULATOR_STATUS_ERROR;
+}
+
+static int mp8859_get_error_flags(struct regulator_dev *rdev,
+ unsigned int *flags)
+{
+ unsigned int status, enabled;
+ int ret;
+
+ *flags = 0;
+
+ /* Output status is only meaingful when enabled */
+ ret = regmap_read(rdev->regmap, MP8859_CTL1_REG, &enabled);
+ if (ret != 0)
+ return ret;
+ enabled &= MP8859_ENABLE_MASK;
+
+ ret = regmap_read(rdev->regmap, MP8859_STATUS_REG, &status);
+ if (ret != 0)
+ return ret;
+
+ if (enabled && !(status & MP8859_PG_MASK))
+ status |= REGULATOR_ERROR_FAIL;
+ if (status & MP8859_OTP_MASK)
+ status |= REGULATOR_ERROR_OVER_TEMP;
+ if (status & MP8859_OTW_MASK)
+ status |= REGULATOR_ERROR_OVER_TEMP_WARN;
+ if (status & MP8859_CC_CV_MASK)
+ status |= REGULATOR_ERROR_OVER_CURRENT;
+
+ return 0;
+}
+
static const struct linear_range mp8859_dcdc_ranges[] = {
REGULATOR_LINEAR_RANGE(0, VOL_MIN_IDX, VOL_MAX_IDX, 10000),
};
@@ -169,6 +226,8 @@ static const struct regulator_ops mp8859_ops = {
.set_mode = mp8859_set_mode,
.get_mode = mp8859_get_mode,
.set_active_discharge = regulator_set_active_discharge_regmap,
+ .get_status = mp8859_get_status,
+ .get_error_flags = mp8859_get_error_flags,
};
static const struct regulator_desc mp8859_regulators[] = {
--
2.39.2
next prev parent reply other threads:[~2024-02-25 15:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-25 14:59 [PATCH 0/8] regulator: mp8859: Cleanups and enhancements Mark Brown
2024-02-25 14:59 ` [PATCH 1/8] regulator: mp8859: Specify register accessibility and enable caching Mark Brown
2024-02-25 14:59 ` [PATCH 2/8] regulator: mp8859: Validate and log device identifier information Mark Brown
2024-02-25 14:59 ` [PATCH 3/8] regulator: mp8859: Support enable control Mark Brown
2024-02-25 14:59 ` [PATCH 4/8] regulator: mp8859: Support mode operations Mark Brown
2024-02-25 14:59 ` [PATCH 5/8] regulator: mp8859: Support active discharge control Mark Brown
2024-02-25 14:59 ` Mark Brown [this message]
2024-02-25 14:59 ` [PATCH 7/8] regulator: mp8859: Report slew rate Mark Brown
2024-02-25 14:59 ` [PATCH 8/8] regulator: mp8859: Implement set_current_limit() Mark Brown
2024-02-26 8:14 ` [PATCH 0/8] regulator: mp8859: Cleanups and enhancements Markus Reichl
2024-02-27 11:31 ` Mark Brown
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=20240225-regulator-mp8859-v1-6-68ee2c839ded@kernel.org \
--to=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.reichl@fivetechno.de \
/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®