mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com
Cc: "Emeric Vigier" <emeric.vigier@stericsson.com>,
	"Ludovic Barré" <ludovic.barre@stericsson.com>,
	"Lee Jones" <lee.jones@linaro.org>
Subject: [PATCH 06/73] regulator: ab8500: Add set_mode/get_mode support
Date: Mon,  4 Feb 2013 11:53:21 +0000	[thread overview]
Message-ID: <1359978868-28736-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1359978868-28736-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 |   71 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ba1483b..1854ec3 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -33,6 +33,8 @@
  * @update_bank: bank to control on/off
  * @update_reg: register to control on/off
  * @update_mask: mask to enable/disable regulator
+ * @update_val: bits holding the regulator current mode
+ * @update_val_idle: bits to enable the regulator in idle (low power) mode
  * @update_val_enable: bits to enable the regulator in normal (high power) mode
  * @voltage_bank: bank to control regulator voltage
  * @voltage_reg: register to control regulator voltage
@@ -47,6 +49,8 @@ struct ab8500_regulator_info {
 	u8 update_bank;
 	u8 update_reg;
 	u8 update_mask;
+	u8 update_val;
+	u8 update_val_idle;
 	u8 update_val_enable;
 	u8 voltage_bank;
 	u8 voltage_reg;
@@ -146,6 +150,63 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
 	return ret;
 }
 
+static int ab8500_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode)
+{
+	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;
+	}
+
+	/*
+	 * update_val_enable is protected by mutex
+	 * into regulator/core.c layout
+	 */
+	switch (mode) {
+	case REGULATOR_MODE_NORMAL:
+		info->update_val = info->update_val_enable;
+		break;
+	case REGULATOR_MODE_IDLE:
+		info->update_val = info->update_val_idle;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return ab8500_regulator_enable(rdev);
+}
+
+static unsigned int ab8500_regulator_get_mode(struct regulator_dev *rdev)
+{
+	struct ab8500_regulator_info *info = rdev_get_drvdata(rdev);
+	int ret;
+	u8 regval;
+
+	if (info == NULL) {
+		dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+		return -EINVAL;
+	}
+
+	ret = abx500_get_register_interruptible(info->dev,
+		info->update_bank, info->update_reg, &regval);
+	if (ret < 0) {
+		dev_err(rdev_get_dev(rdev),
+			"couldn't read 0x%x register\n", info->update_reg);
+		return ret;
+	}
+
+	regval &=info->update_mask;
+	if (regval == info->update_val_enable)
+		ret = REGULATOR_MODE_NORMAL;
+	else if (regval == 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;
@@ -249,6 +310,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,6 +347,8 @@ static struct ab8500_regulator_info
 		.update_bank		= 0x04,
 		.update_reg		= 0x09,
 		.update_mask		= 0x03,
+		.update_val		= 0x01,
+		.update_val_idle	= 0x03,
 		.update_val_enable	= 0x01,
 		.voltage_bank		= 0x04,
 		.voltage_reg		= 0x1f,
@@ -302,6 +367,8 @@ static struct ab8500_regulator_info
 		.update_bank		= 0x04,
 		.update_reg		= 0x09,
 		.update_mask		= 0x0c,
+		.update_val		= 0x04,
+		.update_val_idle	= 0x0c,
 		.update_val_enable	= 0x04,
 		.voltage_bank		= 0x04,
 		.voltage_reg		= 0x20,
@@ -320,6 +387,8 @@ static struct ab8500_regulator_info
 		.update_bank		= 0x04,
 		.update_reg		= 0x0a,
 		.update_mask		= 0x03,
+		.update_val		= 0x01,
+		.update_val_idle	= 0x03,
 		.update_val_enable	= 0x01,
 		.voltage_bank		= 0x04,
 		.voltage_reg		= 0x21,
@@ -338,6 +407,8 @@ static struct ab8500_regulator_info
 		.update_bank		= 0x03,
 		.update_reg		= 0x80,
 		.update_mask		= 0x44,
+		.update_val		= 0x04,
+		.update_val_idle	= 0x44,
 		.update_val_enable	= 0x04,
 		.voltage_bank		= 0x03,
 		.voltage_reg		= 0x80,
-- 
1.7.9.5


  parent reply	other threads:[~2013-02-04 12:16 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-04 11:53 [PATCH 00/73 v2] Regulators: Bring the AB8500 into the 20th century Lee Jones
2013-02-04 11:53 ` [PATCH 01/73] regulator: ab8500: Remove VBB from suspend force Lee Jones
2013-02-04 11:53 ` [PATCH 02/73] regulator: ab8500: Initialize Vrf1 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 03/73] regulator: ab8500: Add init values for vsmps1/2 Lee Jones
2013-02-04 11:53 ` [PATCH 04/73] regulator: ab8500: Added SysClkReq1 control of Vpll Lee Jones
2013-02-04 11:53 ` [PATCH 05/73] ARM: ux500: Vsmps3 controlled by SysClkReq1 Lee Jones
2013-02-04 19:37   ` Mark Brown
2013-02-04 21:21     ` Linus Walleij
2013-02-05 12:01       ` Mark Brown
2013-02-05 13:03         ` Lee Jones
2013-02-26  9:44         ` Lee Jones
2013-02-26 10:16           ` Bengt Jönsson
2013-02-26 12:50           ` Mark Brown
2013-02-04 11:53 ` Lee Jones [this message]
2013-02-04 11:53 ` [PATCH 07/73] regulator: ab8500: Fix for regulator_set_mode functionality Lee Jones
2013-02-04 19:38   ` Mark Brown
2013-02-04 11:53 ` [PATCH 08/73] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-02-04 11:53 ` [PATCH 09/73] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-02-04 11:53 ` [PATCH 10/73] regulator: ab8500: Added more configurable bits Lee Jones
2013-02-04 11:53 ` [PATCH 11/73] regulator: ab8500: Removed initialization of body biasing Lee Jones
2013-02-04 11:53 ` [PATCH 12/73] regulator: core: Show consumers that hold a regulator in Sysfs Lee Jones
2013-02-04 19:41   ` Mark Brown
2013-02-04 11:53 ` [PATCH 13/73] regulator: ab8500: Separate regulator and MFD platform data Lee Jones
2013-02-04 11:53 ` [PATCH 14/73] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-02-04 11:53 ` [PATCH 15/73] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-02-04 11:53 ` [PATCH 16/73] regulator: ab8500-ext: Cosmetic changes Lee Jones
2013-02-04 11:53 ` [PATCH 17/73] regulator: ab8500-ext: Add HW request support Lee Jones
2013-02-04 11:53 ` [PATCH 18/73] regulator: ab8500-ext: Add suspend support Lee Jones
2013-02-04 11:53 ` [PATCH 19/73] regulator: ab8500-ext: Add regulator_set_mode/get_mode Lee Jones
2013-02-04 11:53 ` [PATCH 20/73] regulator: ab8500-ext: Add VextSupply1 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 21/73] regulator: ab8500-ext: Add VextSupply2 regulator Lee Jones
2013-02-04 11:53 ` [PATCH 22/73] regulator: ab8500: Remove USB regulator Lee Jones
2013-02-04 11:53 ` [PATCH 23/73] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-02-04 11:53 ` [PATCH 24/73] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-02-04 11:53 ` [PATCH 25/73] ARM: ux500: Add supply for the Proximity and Hal sensor Lee Jones
2013-02-04 11:53 ` [PATCH 26/73] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-02-04 11:53 ` [PATCH 27/73] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-02-04 11:53 ` [PATCH 28/73] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-02-04 11:53 ` [PATCH 29/73] ARM: ux500: Add supply for the MMIO Camera Lee Jones
2013-02-04 11:53 ` [PATCH 30/73] regulator: ab8500: Remove Vsafe voltage settings Lee Jones
2013-02-04 11:53 ` [PATCH 31/73] regulator: ab8500: Remove Vsafe settings Lee Jones
2013-02-04 11:53 ` [PATCH 32/73] regulator: ab8500: Clean out SoC registers Lee Jones
2013-02-04 11:53 ` [PATCH 33/73] regulator: ab8500: Add support for the AB9540 Lee Jones
2013-02-04 11:53 ` [PATCH 34/73] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-02-04 11:53 ` [PATCH 35/73] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-02-04 11:53 ` [PATCH 36/73] ARM: ux500: Partially revert changes surrounding audio regulators Lee Jones
2013-02-04 11:53 ` [PATCH 37/73] regulator: ab8500: add support for ab8505 Lee Jones
2013-02-04 11:53 ` [PATCH 38/73] ARM: ux500: regulator: Use device IDs instead of device names Lee Jones
2013-02-04 11:53 ` [PATCH 39/73] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-02-04 11:53 ` [PATCH 40/73] regulator: ab8500: Add AB8505 register initialization Lee Jones
2013-02-04 11:53 ` [PATCH 41/73] regulator: ab8500: Provide full settings for AB8540 regulators Lee Jones
2013-02-04 11:53 ` [PATCH 42/73] regulator: ab8500: Correct init mask for AB8540 Lee Jones
2013-02-04 11:53 ` [PATCH 43/73] regulator: ab8500: Add VSDIO definition for the AB8540 Lee Jones
2013-02-04 11:53 ` [PATCH 44/73] regulator: ab8500: Vaux5/6 cannot be disabled on " Lee Jones
2013-02-04 11:54 ` [PATCH 45/73] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-02-04 11:54 ` [PATCH 46/73] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-02-04 11:54 ` [PATCH 47/73] regulator: ab8500: Update AB9540 init masks Lee Jones
2013-02-04 11:54 ` [PATCH 48/73] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-02-04 11:54 ` [PATCH 49/73] regulator: ab8500: Fix vsdio parameters for AB8540 based platforms Lee Jones
2013-02-04 11:54 ` [PATCH 50/73] regulator: ab8500: Correct regulator id values Lee Jones
2013-02-04 11:54 ` [PATCH 51/73] regulator: ab8500: Regulator vaux8 not declared using correct name Lee Jones
2013-02-04 11:54 ` [PATCH 52/73] ARM ux500: Remove external regulators from AB8505 init data Lee Jones
2013-02-05 15:22   ` Linus Walleij
2013-02-04 11:54 ` [PATCH 53/73] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-02-04 11:54 ` [PATCH 54/73] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-02-04 11:54 ` [PATCH 55/73] regulator: ab8500: Provide ExtSupply register init values for AB8505 Lee Jones
2013-02-04 11:54 ` [PATCH 56/73] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-02-04 11:54 ` [PATCH 57/73] regulator: ab8500: Remove surplus include of id.h Lee Jones
2013-02-04 11:54 ` [PATCH 58/73] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-02-04 11:54 ` [PATCH 59/73] regulator: ab8500: Change mode fix for LDO USB Lee Jones
2013-02-04 11:54 ` [PATCH 60/73] ARM: ux500: regulators: Add LDO USB consumer Lee Jones
2013-02-05 15:21   ` Linus Walleij
2013-02-04 11:54 ` [PATCH 61/73] regulator: ab8500: Default value on LDO USB to HP Lee Jones
2013-02-04 11:54 ` [PATCH 62/73] regulator: ab8500: Remove vusb from AB8540 regulator framework Lee Jones
2013-02-04 11:54 ` [PATCH 63/73] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-02-04 11:54 ` [PATCH 64/73] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-02-04 11:54 ` [PATCH 65/73] regulator: ab8500: Update VAna supply management for the AB9540 Lee Jones
2013-02-04 11:54 ` [PATCH 66/73] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-02-04 11:54 ` [PATCH 67/73] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-02-04 11:54 ` [PATCH 68/73] regulator: ab8500: Provide DT support for additional platforms Lee Jones
2013-02-04 11:54 ` [PATCH 69/73] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-02-04 11:54 ` [PATCH 70/73] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-02-04 11:54 ` [PATCH 71/73] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-02-04 11:54 ` [PATCH 72/73] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-02-04 11:54 ` [PATCH 73/73] ARM: ux500: Pass regulator platform data using the new format Lee Jones

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=1359978868-28736-7-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=emeric.vigier@stericsson.com \
    --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®