Commit 991d6799 authored by krzysztof.adamski@nokia.com's avatar krzysztof.adamski@nokia.com Committed by Guenter Roeck

pmbus: support for custom sysfs attributes

This patch makes it possible to pass custom struct attribute_group array
via the pmbus_driver_info struct so that those can be added to the
attribute groups passed to hwmon_device_register_with_groups().

This makes it possible to register custom sysfs attributes by PMBUS
drivers similar to how you can do this with most other busses/classes.
Signed-off-by: default avatarKrzysztof Adamski <krzysztof.adamski@nokia.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 9f00995e
...@@ -432,6 +432,9 @@ struct pmbus_driver_info { ...@@ -432,6 +432,9 @@ struct pmbus_driver_info {
/* Regulator functionality, if supported by this chip driver. */ /* Regulator functionality, if supported by this chip driver. */
int num_regulators; int num_regulators;
const struct regulator_desc *reg_desc; const struct regulator_desc *reg_desc;
/* custom attributes */
const struct attribute_group **groups;
}; };
/* Regulator ops */ /* Regulator ops */
......
...@@ -103,7 +103,7 @@ struct pmbus_data { ...@@ -103,7 +103,7 @@ struct pmbus_data {
int max_attributes; int max_attributes;
int num_attributes; int num_attributes;
struct attribute_group group; struct attribute_group group;
const struct attribute_group *groups[2]; const struct attribute_group **groups;
struct dentry *debugfs; /* debugfs device directory */ struct dentry *debugfs; /* debugfs device directory */
struct pmbus_sensor *sensors; struct pmbus_sensor *sensors;
...@@ -2415,6 +2415,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, ...@@ -2415,6 +2415,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
struct device *dev = &client->dev; struct device *dev = &client->dev;
const struct pmbus_platform_data *pdata = dev_get_platdata(dev); const struct pmbus_platform_data *pdata = dev_get_platdata(dev);
struct pmbus_data *data; struct pmbus_data *data;
size_t groups_num = 0;
int ret; int ret;
if (!info) if (!info)
...@@ -2429,6 +2430,15 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, ...@@ -2429,6 +2430,15 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
if (info->groups)
while (info->groups[groups_num])
groups_num++;
data->groups = devm_kcalloc(dev, groups_num + 2, sizeof(void *),
GFP_KERNEL);
if (!data->groups)
return -ENOMEM;
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->dev = dev; data->dev = dev;
...@@ -2456,6 +2466,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, ...@@ -2456,6 +2466,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
} }
data->groups[0] = &data->group; data->groups[0] = &data->group;
memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num);
data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name, data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
data, data->groups); data, data->groups);
if (IS_ERR(data->hwmon_dev)) { if (IS_ERR(data->hwmon_dev)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment