From: Wei Ni <wni@nvidia.com>
To: <khali@linux-fr.org>, <linux@roeck-us.net>
Cc: <broonie@kernel.org>, <swarren@wwwdotorg.org>,
<lm-sensors@lm-sensors.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Wei Ni <wni@nvidia.com>
Subject: [PATCH v3 1/2] hwmon: (lm90) Add power control
Date: Mon, 9 Sep 2013 18:29:11 +0800 [thread overview]
Message-ID: <1378722552-10357-2-git-send-email-wni@nvidia.com> (raw)
In-Reply-To: <1378722552-10357-1-git-send-email-wni@nvidia.com>
The device lm90 can be controlled by the vcc rail.
Adding the regulator support to power on/off the vcc rail.
Enable the "vcc" regulator before accessing the device.
Signed-off-by: Wei Ni <wni@nvidia.com>
---
drivers/hwmon/lm90.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index cdff742..bd313f4 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -89,6 +89,8 @@
#include <linux/err.h>
#include <linux/mutex.h>
#include <linux/sysfs.h>
+#include <linux/regulator/consumer.h>
+#include <linux/delay.h>
/*
* Addresses to scan
@@ -302,6 +304,7 @@ static const struct lm90_params lm90_params[] = {
struct lm90_data {
struct device *hwmon_dev;
struct mutex update_lock;
+ struct regulator *lm90_reg;
char valid; /* zero until following fields are valid */
unsigned long last_updated; /* in jiffies */
int kind;
@@ -1397,8 +1400,23 @@ static int lm90_probe(struct i2c_client *client,
struct device *dev = &client->dev;
struct i2c_adapter *adapter = to_i2c_adapter(dev->parent);
struct lm90_data *data;
+ struct regulator *reg;
int err;
+ reg = devm_regulator_get_optional(dev, "vcc");
+ if (!IS_ERR(reg)) {
+ err = regulator_enable(reg);
+ if (err < 0) {
+ dev_err(&client->dev,
+ "Failed to enable regulator: %d\n", err);
+ return err;
+ }
+ msleep(25);
+ } else {
+ if (PTR_ERR(reg) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ }
+
data = devm_kzalloc(&client->dev, sizeof(struct lm90_data), GFP_KERNEL);
if (!data)
return -ENOMEM;
@@ -1406,6 +1424,8 @@ static int lm90_probe(struct i2c_client *client,
i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
+ data->lm90_reg = reg;
+
/* Set the device type */
data->kind = id->driver_data;
if (data->kind == adm1032) {
@@ -1473,6 +1493,9 @@ exit_remove_files:
lm90_remove_files(client, data);
exit_restore:
lm90_restore_conf(client, data);
+ if (!IS_ERR(data->lm90_reg))
+ regulator_disable(data->lm90_reg);
+
return err;
}
@@ -1483,6 +1506,8 @@ static int lm90_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev);
lm90_remove_files(client, data);
lm90_restore_conf(client, data);
+ if (!IS_ERR(data->lm90_reg))
+ regulator_disable(data->lm90_reg);
return 0;
}
--
1.7.9.5
next prev parent reply other threads:[~2013-09-09 10:29 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 10:29 [PATCH v3 0/2] Add power control for lm90 Wei Ni
2013-09-09 10:29 ` Wei Ni [this message]
2013-09-09 11:12 ` [PATCH v3 1/2] hwmon: (lm90) Add power control Mark Brown
2013-09-09 11:34 ` Guenter Roeck
2013-09-09 13:50 ` Mark Brown
2013-09-09 15:50 ` Guenter Roeck
2013-09-09 16:02 ` Mark Brown
2013-09-09 16:17 ` Guenter Roeck
2013-09-09 20:39 ` Mark Brown
2013-09-10 4:05 ` Wei Ni
2013-09-10 4:50 ` Guenter Roeck
2013-09-10 5:39 ` Wei Ni
2013-09-10 5:54 ` Guenter Roeck
2013-09-10 6:30 ` Wei Ni
2013-09-10 10:13 ` Mark Brown
2013-09-10 11:29 ` Wei Ni
2013-09-10 12:11 ` Mark Brown
2013-09-11 9:40 ` Wei Ni
2013-09-10 3:22 ` Wei Ni
2013-09-10 3:36 ` Guenter Roeck
2013-09-10 3:40 ` Stephen Warren
2013-09-10 3:53 ` Guenter Roeck
2013-09-10 4:12 ` Wei Ni
2013-09-10 4:13 ` Stephen Warren
2013-09-10 4:44 ` Guenter Roeck
2013-09-10 10:09 ` Mark Brown
2013-09-10 15:07 ` Stephen Warren
2013-09-10 17:04 ` Mark Brown
2013-09-10 17:44 ` Stephen Warren
2013-09-10 18:07 ` Guenter Roeck
2013-09-10 18:18 ` Mark Brown
2013-09-10 18:37 ` Stephen Warren
2013-09-10 18:52 ` Mark Brown
2013-09-11 11:35 ` Wei Ni
2013-09-10 17:05 ` Mark Brown
2013-09-09 10:29 ` [PATCH v3 2/2] Documentation: dt: hwmon: add OF document for LM90 Wei Ni
2013-09-09 10:52 ` Guenter Roeck
2013-09-09 22:14 ` Stephen Warren
2013-09-10 4:25 ` Wei Ni
2013-09-09 10:57 ` Ramkumar Ramachandra
2013-09-10 4:35 ` Wei Ni
2013-09-10 4:36 ` Wei Ni
2013-09-09 22:15 ` Stephen Warren
2013-09-09 22:23 ` Guenter Roeck
2013-09-10 4:25 ` Wei Ni
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=1378722552-10357-2-git-send-email-wni@nvidia.com \
--to=wni@nvidia.com \
--cc=broonie@kernel.org \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lm-sensors@lm-sensors.org \
--cc=swarren@wwwdotorg.org \
/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
Powered by JetHome