From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
broonie@opensource.wolfsonmicro.com
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
"Emeric Vigier" <emeric.vigier@stericsson.com>,
"Ludovic Barré" <ludovic.barre@stericsson.com>,
"Lee Jones" <lee.jones@linaro.org>
Subject: [PATCH 02/46] regulator: ab8500: Add set_mode/get_mode support
Date: Thu, 21 Mar 2013 15:58:59 +0000 [thread overview]
Message-ID: <1363881583-15234-3-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org>
From: Emeric Vigier <emeric.vigier@stericsson.com>
Signed-off-by: Ludovic Barré <ludovic.barre@stericsson.com>
Signed-off-by: Emeric Vigier <emeric.vigier@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
---
drivers/regulator/ab8500.c | 112 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 94 insertions(+), 18 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 4d9d556..283d9a5 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -30,10 +30,13 @@
* @dev: device pointer
* @desc: regulator description
* @regulator_dev: regulator device
+ * @is_enabled: status of regulator (on/off)
* @update_bank: bank to control on/off
* @update_reg: register to control on/off
- * @update_mask: mask to enable/disable regulator
- * @update_val_enable: bits to enable the regulator in normal (high power) mode
+ * @update_mask: mask to enable/disable and set mode of regulator
+ * @update_val: bits holding the regulator current mode
+ * @update_val_idle: bits to enable the regulator in idle (low power) mode
+ * @update_val_normal: bits to enable the regulator in normal (high power) mode
* @voltage_bank: bank to control regulator voltage
* @voltage_reg: register to control regulator voltage
* @voltage_mask: mask to control regulator voltage
@@ -44,10 +47,13 @@ struct ab8500_regulator_info {
struct device *dev;
struct regulator_desc desc;
struct regulator_dev *regulator;
+ bool is_enabled;
u8 update_bank;
u8 update_reg;
u8 update_mask;
- u8 update_val_enable;
+ u8 update_val;
+ u8 update_val_idle;
+ u8 update_val_normal;
u8 voltage_bank;
u8 voltage_reg;
u8 voltage_mask;
@@ -108,15 +114,17 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
- info->update_mask, info->update_val_enable);
+ info->update_mask, info->update_val);
if (ret < 0)
dev_err(rdev_get_dev(rdev),
"couldn't set enable bits for regulator\n");
+ info->is_enabled = true;
+
dev_vdbg(rdev_get_dev(rdev),
"%s-enable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
info->desc.name, info->update_bank, info->update_reg,
- info->update_mask, info->update_val_enable);
+ info->update_mask, info->update_val);
return ret;
}
@@ -138,6 +146,8 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
dev_err(rdev_get_dev(rdev),
"couldn't set disable bits for regulator\n");
+ info->is_enabled = false;
+
dev_vdbg(rdev_get_dev(rdev),
"%s-disable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
info->desc.name, info->update_bank, info->update_reg,
@@ -146,6 +156,61 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
return ret;
}
+static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
+ unsigned int mode)
+{
+ int ret = 0;
+
+ struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
+
+ if (info == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ return -EINVAL;
+ }
+
+ switch (mode) {
+ case REGULATOR_MODE_NORMAL:
+ info->update_val = info->update_val_normal;
+ break;
+ case REGULATOR_MODE_IDLE:
+ info->update_val = info->update_val_idle;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (info->is_enabled) {
+ ret = abx500_mask_and_set_register_interruptible(info->dev,
+ info->update_bank, info->update_reg,
+ info->update_mask, info->update_val);
+ if (ret < 0)
+ dev_err(rdev_get_dev(rdev),
+ "couldn't set regulator mode\n");
+ }
+
+ return ret;
+}
+
+static unsigned int ab8500_regulator_get_mode(struct regulator_dev *rdev)
+{
+ struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
+ int ret;
+
+ if (info == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ return -EINVAL;
+ }
+
+ if (info->update_val == info->update_val_normal)
+ ret = REGULATOR_MODE_NORMAL;
+ else if (info->update_val == info->update_val_idle)
+ ret = REGULATOR_MODE_IDLE;
+ else
+ ret = -EINVAL;
+
+ return ret;
+}
+
static int ab8500_regulator_is_enabled(struct regulator_dev *rdev)
{
int ret;
@@ -172,9 +237,11 @@ static int ab8500_regulator_is_enabled(struct regulator_dev *rdev)
info->update_mask, regval);
if (regval & info->update_mask)
- return true;
+ info->is_enabled = true;
else
- return false;
+ info->is_enabled = false;
+
+ return info->is_enabled;
}
static int ab8500_regulator_get_voltage_sel(struct regulator_dev *rdev)
@@ -249,6 +316,8 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev,
static struct regulator_ops ab8500_regulator_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
+ .set_mode = ab8500_regulator_set_mode,
+ .get_mode = ab8500_regulator_get_mode,
.is_enabled = ab8500_regulator_is_enabled,
.get_voltage_sel = ab8500_regulator_get_voltage_sel,
.set_voltage_sel = ab8500_regulator_set_voltage_sel,
@@ -284,7 +353,9 @@ static struct ab8500_regulator_info
.update_bank = 0x04,
.update_reg = 0x09,
.update_mask = 0x03,
- .update_val_enable = 0x01,
+ .update_val = 0x01,
+ .update_val_idle = 0x03,
+ .update_val_normal = 0x01,
.voltage_bank = 0x04,
.voltage_reg = 0x1f,
.voltage_mask = 0x0f,
@@ -302,7 +373,9 @@ static struct ab8500_regulator_info
.update_bank = 0x04,
.update_reg = 0x09,
.update_mask = 0x0c,
- .update_val_enable = 0x04,
+ .update_val = 0x04,
+ .update_val_idle = 0x0c,
+ .update_val_normal = 0x04,
.voltage_bank = 0x04,
.voltage_reg = 0x20,
.voltage_mask = 0x0f,
@@ -320,7 +393,9 @@ static struct ab8500_regulator_info
.update_bank = 0x04,
.update_reg = 0x0a,
.update_mask = 0x03,
- .update_val_enable = 0x01,
+ .update_val = 0x01,
+ .update_val_idle = 0x03,
+ .update_val_normal = 0x01,
.voltage_bank = 0x04,
.voltage_reg = 0x21,
.voltage_mask = 0x07,
@@ -338,7 +413,9 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x80,
.update_mask = 0x44,
- .update_val_enable = 0x04,
+ .update_val = 0x04,
+ .update_val_idle = 0x44,
+ .update_val_normal = 0x04,
.voltage_bank = 0x03,
.voltage_reg = 0x80,
.voltage_mask = 0x38,
@@ -365,7 +442,7 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x80,
.update_mask = 0x82,
- .update_val_enable = 0x02,
+ .update_val = 0x02,
},
[AB8500_LDO_USB] = {
.desc = {
@@ -380,7 +457,6 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
- .update_val_enable = 0x01,
},
[AB8500_LDO_AUDIO] = {
.desc = {
@@ -395,7 +471,7 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x02,
- .update_val_enable = 0x02,
+ .update_val = 0x02,
},
[AB8500_LDO_ANAMIC1] = {
.desc = {
@@ -410,7 +486,7 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x08,
- .update_val_enable = 0x08,
+ .update_val = 0x08,
},
[AB8500_LDO_ANAMIC2] = {
.desc = {
@@ -425,7 +501,7 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x10,
- .update_val_enable = 0x10,
+ .update_val = 0x10,
},
[AB8500_LDO_DMIC] = {
.desc = {
@@ -440,7 +516,7 @@ static struct ab8500_regulator_info
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x04,
- .update_val_enable = 0x04,
+ .update_val = 0x04,
},
[AB8500_LDO_ANA] = {
.desc = {
@@ -455,7 +531,7 @@ static struct ab8500_regulator_info
.update_bank = 0x04,
.update_reg = 0x06,
.update_mask = 0x0c,
- .update_val_enable = 0x04,
+ .update_val = 0x04,
},
--
1.7.10.4
next prev parent reply other threads:[~2013-03-21 16:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 15:58 [PATCH 00/46] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-03-21 15:58 ` [PATCH 01/46] regulator: ab8500: Further populate initialisation registers Lee Jones
2013-03-21 15:58 ` Lee Jones [this message]
2013-03-21 15:59 ` [PATCH 03/46] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-03-21 15:59 ` [PATCH 04/46] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-03-21 15:59 ` [PATCH 05/46] regulator: ab8500: Another push to synchronise recent AB8500 developments Lee Jones
2013-03-21 15:59 ` [PATCH 06/46] regulator: ab8500: Separate regulator and MFD platform data Lee Jones
2013-03-22 11:04 ` Mark Brown
2013-03-21 15:59 ` [PATCH 07/46] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-03-28 0:06 ` Mark Brown
2013-03-21 15:59 ` [PATCH 08/46] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-03-28 0:07 ` Mark Brown
2013-03-21 15:59 ` [PATCH 09/46] regulator: ab8500-ext: Add HW request support Lee Jones
2013-03-21 15:59 ` [PATCH 10/46] regulator: ab8500-ext: Add suspend support Lee Jones
2013-03-21 15:59 ` [PATCH 11/46] regulator: ab8500: Remove USB regulator Lee Jones
2013-03-21 15:59 ` [PATCH 12/46] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-03-21 15:59 ` [PATCH 13/46] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-03-28 0:09 ` Mark Brown
2013-03-21 15:59 ` [PATCH 14/46] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-03-28 0:09 ` Mark Brown
2013-03-21 15:59 ` [PATCH 15/46] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 16/46] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 17/46] ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1 Lee Jones
2013-03-28 0:10 ` Mark Brown
2013-03-21 15:59 ` [PATCH 18/46] regulator: ab8500: Clean out SoC registers Lee Jones
2013-03-28 0:11 ` Mark Brown
2013-03-21 15:59 ` [PATCH 19/46] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-03-21 15:59 ` [PATCH 20/46] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-03-21 15:59 ` [PATCH 21/46] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-03-28 0:13 ` Mark Brown
2013-03-21 15:59 ` [PATCH 22/46] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-03-21 15:59 ` [PATCH 23/46] regulator: ab8500: add support for ab8505 Lee Jones
2013-03-21 15:59 ` [PATCH 24/46] ARM: ux500: regulator: Add accelerometer and fix magnetometer supply device ID Lee Jones
2013-03-28 0:15 ` Mark Brown
2013-03-21 15:59 ` [PATCH 25/46] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-03-21 15:59 ` [PATCH 26/46] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-03-21 15:59 ` [PATCH 27/46] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-03-21 15:59 ` [PATCH 28/46] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-03-28 0:16 ` Mark Brown
2013-03-21 15:59 ` [PATCH 29/46] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-03-21 15:59 ` [PATCH 30/46] regulator: ab8500: Supply platform specific regulator id values Lee Jones
2013-03-21 15:59 ` [PATCH 31/46] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-03-21 15:59 ` [PATCH 32/46] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-03-21 15:59 ` [PATCH 33/46] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-03-21 15:59 ` [PATCH 34/46] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-03-21 15:59 ` [PATCH 35/46] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-03-21 15:59 ` [PATCH 36/46] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-03-21 15:59 ` [PATCH 37/46] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-03-28 0:18 ` Mark Brown
2013-03-21 15:59 ` [PATCH 38/46] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-03-21 15:59 ` [PATCH 39/46] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-03-21 15:59 ` [PATCH 40/46] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-03-21 15:59 ` [PATCH 41/46] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-03-21 15:59 ` [PATCH 42/46] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-03-21 15:59 ` [PATCH 43/46] ARM: ux500: Pass regulator platform data using the new format Lee Jones
2013-03-21 15:59 ` [PATCH 44/46] regulator: ab8500: Amend the update value for AB8500_LDO_INTCORE regulator Lee Jones
2013-03-28 0:20 ` Mark Brown
2013-03-21 15:59 ` [PATCH 45/46] regulator: ab8500: Shuffle init functions into a more logical order Lee Jones
2013-03-21 15:59 ` [PATCH 46/46] ARM: ux500: Regulators: Bring the AB8500 regulator platform data up-to-date Lee Jones
2013-03-28 0:22 ` 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=1363881583-15234-3-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=emeric.vigier@stericsson.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.barre@stericsson.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
all inboxes | Powered by JetHome®