linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Support Opensource <support.opensource@diasemi.com>,
	patches@opensource.cirrus.com,
	Ashish Jangam <ashish.jangam@kpitcummins.com>,
	Steve Twiss <stwiss.opensource@diasemi.com>,
	Paul Kocialkowski <contact@paulk.fr>, Milo Kim <milo.kim@ti.com>,
	Keerthy <j-keerthy@ti.com>,
	James Ban <James.Ban.opensource@diasemi.com>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	linux-kernel@vger.kernel.org, Axel Lin <axel.lin@ingics.com>
Subject: [PATCH 11/11] regulator: wm831x-dcdc: Convert to use regulator_set/get_current_limit_regmap
Date: Thu, 28 Feb 2019 21:40:22 +0800	[thread overview]
Message-ID: <20190228134022.32625-12-axel.lin@ingics.com> (raw)
In-Reply-To: <20190228134022.32625-1-axel.lin@ingics.com>

Use regulator_set/get_current_limit_regmap helpers to save some code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/regulator/wm831x-dcdc.c | 42 +++++----------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 828f262d6be0..12b422373580 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -308,48 +308,14 @@ static const unsigned int wm831x_dcdc_ilim[] = {
 	125000, 250000, 375000, 500000, 625000, 750000, 875000, 1000000
 };
 
-static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
-					   int min_uA, int max_uA)
-{
-	struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-	struct wm831x *wm831x = dcdc->wm831x;
-	u16 reg = dcdc->base + WM831X_DCDC_CONTROL_2;
-	int i;
-
-	for (i = ARRAY_SIZE(wm831x_dcdc_ilim) - 1; i >= 0; i--) {
-		if ((min_uA <= wm831x_dcdc_ilim[i]) &&
-		    (wm831x_dcdc_ilim[i] <= max_uA))
-			return wm831x_set_bits(wm831x, reg,
-					       WM831X_DC1_HC_THR_MASK,
-						i << WM831X_DC1_HC_THR_SHIFT);
-	}
-
-	return -EINVAL;
-}
-
-static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
-{
-	struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-	struct wm831x *wm831x = dcdc->wm831x;
-	u16 reg = dcdc->base + WM831X_DCDC_CONTROL_2;
-	int val;
-
-	val = wm831x_reg_read(wm831x, reg);
-	if (val < 0)
-		return val;
-
-	val = (val & WM831X_DC1_HC_THR_MASK) >> WM831X_DC1_HC_THR_SHIFT;
-	return wm831x_dcdc_ilim[val];
-}
-
 static const struct regulator_ops wm831x_buckv_ops = {
 	.set_voltage_sel = wm831x_buckv_set_voltage_sel,
 	.get_voltage_sel = wm831x_buckv_get_voltage_sel,
 	.list_voltage = regulator_list_voltage_linear_range,
 	.map_voltage = regulator_map_voltage_linear_range,
 	.set_suspend_voltage = wm831x_buckv_set_suspend_voltage,
-	.set_current_limit = wm831x_buckv_set_current_limit,
-	.get_current_limit = wm831x_buckv_get_current_limit,
+	.set_current_limit = regulator_set_current_limit_regmap,
+	.get_current_limit = regulator_get_current_limit_regmap,
 
 	.is_enabled = regulator_is_enabled_regmap,
 	.enable = regulator_enable_regmap,
@@ -475,6 +441,10 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
 	dcdc->desc.owner = THIS_MODULE;
 	dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
 	dcdc->desc.enable_mask = 1 << id;
+	dcdc->desc.csel_reg = dcdc->base + WM831X_DCDC_CONTROL_2;
+	dcdc->desc.csel_mask = WM831X_DC1_HC_THR_MASK;
+	dcdc->desc.n_current_limits = ARRAY_SIZE(wm831x_dcdc_ilim);
+	dcdc->desc.curr_table = wm831x_dcdc_ilim;
 
 	ret = wm831x_reg_read(wm831x, dcdc->base + WM831X_DCDC_ON_CONFIG);
 	if (ret < 0) {
-- 
2.17.1


  parent reply	other threads:[~2019-02-28 13:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-28 13:40 [PATCH 00/11] regulator: Add set/get_current_limit helpers and use it Axel Lin
2019-02-28 13:40 ` [PATCH 01/11] regulator: Fix comment for csel_reg and csel_mask Axel Lin
2019-02-28 13:40 ` [PATCH 02/11] regulator: core: Add set/get_current_limit helpers for regmap users Axel Lin
2019-02-28 13:40 ` [PATCH 03/11] regulator: da9055: Convert to use regulator_set/get_current_limit_regmap Axel Lin
2019-02-28 15:18   ` Steve Twiss
2019-02-28 13:40 ` [PATCH 04/11] regulator: da9210: " Axel Lin
2019-02-28 14:01   ` Steve Twiss
2019-02-28 13:40 ` [PATCH 05/11] regulator: lp872x: " Axel Lin
2019-02-28 13:40 ` [PATCH 06/11] regulator: lp873x: " Axel Lin
2019-02-28 13:40 ` [PATCH 07/11] regulator: max77650: " Axel Lin
2019-02-28 14:11   ` Bartosz Golaszewski
2019-02-28 13:40 ` [PATCH 08/11] regulator: pv88060: " Axel Lin
2019-02-28 15:26   ` Steve Twiss
2019-02-28 13:40 ` [PATCH 09/11] regulator: pv88080: " Axel Lin
2019-02-28 15:41   ` Steve Twiss
2019-02-28 13:40 ` [PATCH 10/11] regulator: pv88090: " Axel Lin
2019-02-28 15:47   ` Steve Twiss
2019-02-28 13:40 ` Axel Lin [this message]
2019-03-01  8:33   ` [PATCH 11/11] regulator: wm831x-dcdc: " Charles Keepax

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=20190228134022.32625-12-axel.lin@ingics.com \
    --to=axel.lin@ingics.com \
    --cc=James.Ban.opensource@diasemi.com \
    --cc=ashish.jangam@kpitcummins.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=broonie@kernel.org \
    --cc=contact@paulk.fr \
    --cc=j-keerthy@ti.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=milo.kim@ti.com \
    --cc=patches@opensource.cirrus.com \
    --cc=stwiss.opensource@diasemi.com \
    --cc=support.opensource@diasemi.com \
    /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;
as well as URLs for NNTP newsgroup(s).