From: Alan Tull <at...@opensource.altera.com>
To add a regulator, the pmbus device driver needs to add
regulator_desc information to its pmbus_driver_info struct.
The regulator_init_data can be intialized from either
platform data or the device tree.
Signed-off-by: Alan Tull <at...@opensource.altera.com>
v2: Remove '#include <linux/regulator/machine.h>'
Only one regulator per pmbus device
Get regulator_init_data from pdata or device tree
---
drivers/hwmon/pmbus/pmbus.h | 5 ++++
drivers/hwmon/pmbus/pmbus_core.c | 51 ++++++++++++++++++++++++++++++++++++++
include/linux/i2c/pmbus.h | 1 +
3 files changed, 57 insertions(+)
diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h
index fa9beb3..93fadc3 100644
--- a/drivers/hwmon/pmbus/pmbus.h
+++ b/drivers/hwmon/pmbus/pmbus.h
@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/regulator/driver.h>
+
#ifndef PMBUS_H
#define PMBUS_H
@@ -365,6 +367,9 @@ struct pmbus_driver_info {
*/
int (*identify)(struct i2c_client *client,
struct pmbus_driver_info *info);
+
+ /* Regulator functionality, if supported by this chip driver. */
+ const struct regulator_desc *reg_desc;
};
/* Function declarations */
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 291d11f..472baff 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -29,6 +29,8 @@
#include <linux/hwmon-sysfs.h>
#include <linux/jiffies.h>
#include <linux/i2c/pmbus.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/regulator/driver.h>
#include "pmbus.h"
/*
@@ -1727,6 +1729,48 @@ static int pmbus_init_common(struct i2c_client *client,
struct pmbus_data *data,
return 0;
}
+#if IS_ENABLED(CONFIG_REGULATOR)
+static int pmbus_regulator_register(struct pmbus_data *data,
+ const struct pmbus_platform_data *pdata)
+{
+ struct device *dev = data->dev;
+ struct device_node *np = dev->of_node;
+ const struct pmbus_driver_info *info = data->info;
+ const struct regulator_desc *reg_desc = info->reg_desc;
+ struct regulator_dev *rdev;
+ struct regulator_config config = { };
+
+ if (!reg_desc)
+ return 0;
+
+ if (pdata && pdata->reg_init_data) {
+ config.init_data = pdata->reg_init_data;
+ } else {
+ config.init_data = of_get_regulator_init_data(dev, np);
+ if (!config.init_data)
+ return -ENOMEM;
+ }
+
+ config.dev = dev;
+ config.driver_data = data;
+
+ rdev = devm_regulator_register(dev, reg_desc, &config);
+ if (IS_ERR(rdev)) {
+ dev_err(dev, "failed to register regulator %s\n",
+ reg_desc->name);
+ return PTR_ERR(rdev);
+ }
+
+ return 0;
+}
+#else
+static int pmbus_regulator_register(struct pmbus_data *data,
+ const struct pmbus_platform_data *pdata)
+{
+ return 0;
+}
+#endif
+
int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
struct pmbus_driver_info *info)
{
@@ -1781,8 +1825,15 @@ int pmbus_do_probe(struct i2c_client *client, const
struct i2c_device_id *id,
dev_err(dev, "Failed to register hwmon device\n");
goto out_kfree;
}
+
+ ret = pmbus_regulator_register(data, pdata);
+ if (ret)
+ goto out_unregister;
+
return 0;
+out_unregister:
+ hwmon_device_unregister(data->hwmon_dev);
out_kfree:
kfree(data->group.attrs);
return ret;
diff --git a/include/linux/i2c/pmbus.h b/include/linux/i2c/pmbus.h
index 69280db..15e08da 100644
--- a/include/linux/i2c/pmbus.h
+++ b/include/linux/i2c/pmbus.h
@@ -40,6 +40,7 @@
struct pmbus_platform_data {
u32 flags; /* Device specific flags */
+ struct regulator_init_data *reg_init_data;
};
#endif /* _PMBUS_H_ */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
