| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1360148051-7560-3-git-send-email-lee.jones@linaro.org>
Date: Wed, 6 Feb 2013 10:53:24 +0000
From: Lee Jones <lee.jones@...aro.org>
To: linux-kernel@...r.kernel.org
Cc: broonie@...nsource.wolfsonmicro.com, linus.walleij@...aro.org,
Emeric Vigier <emeric.vigier@...ricsson.com>,
Ludovic Barré <ludovic.barre@...ricsson.com>,
Lee Jones <lee.jones@...aro.org>
Subject: [PATCH 02/49] regulator: ab8500: Add set_mode/get_mode support
From: Emeric Vigier <emeric.vigier@...ricsson.com>
Signed-off-by: Ludovic Barré <ludovic.barre@...ricsson.com>
Signed-off-by: Emeric Vigier <emeric.vigier@...ricsson.com>
Signed-off-by: Lee Jones <lee.jones@...aro.org>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@...ricsson.com>
---
drivers/regulator/ab8500.c | 71 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 4d9d556..8426c8e 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, ®val);
+ 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists