hwmon: (nct7802) Add pwmX_enable attribute
PATCH 1/1 hwmon: (nct7802) Add pwmX_enable attribute
Introduced REG_SMARTFAN_EN_BASE, pwmX_enable,show_pwm_enable, store_pwm_enable.
--- drivers/hwmon/nct7802.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/hwmon/nct7802.c +46 -0
@@ -53,6 +53,7 @@ static const u8 REG_VOLTAGE_LIMIT_MSB_SHIFT[2][5] = {#define REG_PECI_ENABLE 0x23#define REG_FAN_ENABLE 0x24#define REG_VMON_ENABLE 0x25 +#define REG_SMARTFAN_EN_BASE 0x64#define REG_VENDOR_ID 0xfd#define REG_CHIP_ID 0xfe#define REG_VERSION_ID 0xff
@@ -151,6 +152,43 @@ static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,return err ? : count; } +static ssize_t show_pwm_enable (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct nct7802_data *data =dev_get_drvdata (dev); +struct sensor_device_attribute *sattr =to_sensor_dev_attr (attr); +unsigned int reg, enabled, pwm; +int ret; + + ret =regmap_read (data->regmap,REG_SMARTFAN_EN_BASE + sattr->index /2 , + ®); +if (ret <0 ) +return ret; + enabled = reg >> (sattr->index %2 *4 ) &1 ; +return sprintf (buf,"%u\n" , enabled +1 ); +} + +static ssize_t store_pwm_enable (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct nct7802_data *data =dev_get_drvdata (dev); +struct sensor_device_attribute *sattr =to_sensor_dev_attr (attr); +u8 val; +int ret; + + ret =kstrtou8 (buf,0 , &val); +if (ret <0 ) +return ret; +if (val <1 || val >3 ) +return -EINVAL ; + ret =regmap_update_bits (data->regmap, +REG_SMARTFAN_EN_BASE + sattr->index /2 , +1 << sattr->index %2 *4 , + (val -1 ) << sattr->index %2 *4 ); +return ret ? : count; +} +static int nct7802_read_temp (struct nct7802_data *data,u8 reg_temp,u8 reg_temp_low,int *temp) {
@@ -793,6 +831,11 @@ static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 0x60); static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 0x61); static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO | S_IWUSR, show_pwm, store_pwm, 0x62); +/* 7.2.95... Temperature to Fan mapping Relationships Register */ +static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR, show_pwm_enable, store_pwm_enable, 0); +static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR, show_pwm_enable, store_pwm_enable, 1); +static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR, show_pwm_enable, store_pwm_enable, 2); +static struct attribute *nct7802_fan_attrs[] = { &sensor_dev_attr_fan1_input.dev_attr.attr, &sensor_dev_attr_fan1_min.dev_attr.attr,
@@ -832,10 +875,13 @@ static struct attribute_group nct7802_fan_group = { };static struct attribute *nct7802_pwm_attrs[] = { + &sensor_dev_attr_pwm1_enable.dev_attr.attr, &sensor_dev_attr_pwm1_mode.dev_attr.attr, &sensor_dev_attr_pwm1.dev_attr.attr, + &sensor_dev_attr_pwm2_enable.dev_attr.attr, &sensor_dev_attr_pwm2_mode.dev_attr.attr, &sensor_dev_attr_pwm2.dev_attr.attr, + &sensor_dev_attr_pwm3_enable.dev_attr.attr, &sensor_dev_attr_pwm3_mode.dev_attr.attr, &sensor_dev_attr_pwm3.dev_attr.attr,NULL
Signature · 7 lines
1.9.1 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerHi Constantine,
Quoted 27 lines · Constantine Shulyupin
Introduced
REG_SMARTFAN_EN_BASE,pwmX_enable,show_pwm_enable,store_pwm_enable.Signed-off-by Constantine Shulyupin <[email protected]>--- drivers/hwmon/nct7802.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/hwmon/nct7802.c +4
-0@@ -53,6 +53,7 @@ static const u8 REG_VOLTAGE_LIMIT_MSB_SHIFT[2][5] = {#define REG_PECI_ENABLE 0x23#define REG_FAN_ENABLE 0x24#define REG_VMON_ENABLE 0x25 +#define REG_SMARTFAN_EN_BASE 0x64#define REG_VENDOR_ID 0xfd#define REG_CHIP_ID 0xfe#define REG_VERSION_ID 0xff@@ -151,6 +152,43 @@ static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,return err ? : count; } +static ssize_t show_pwm_enable (struct device *dev, +struct device_attribute *attr,char *buf) +{
drivers/hwmon/nct7802.c static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr, · line 167
Quoted 10 lines
drivers/hwmon/nct7802.c +10
-0+struct nct7802_data *data =dev_get_drvdata (dev); +struct sensor_device_attribute *sattr =to_sensor_dev_attr (attr); +unsigned int reg, enabled, pwm; +int ret; + + ret =regmap_read (data->regmap,REG_SMARTFAN_EN_BASE + sattr->index /2 , + ®); +if (ret <0 ) +return ret; + enabled = reg >> (sattr->index %2 *4 ) &1 ;
While that works, I think it would be nicer to have something like
#define REG_SMARTFAN_EN(x) (REG_SMARTFAN_EN_BASE + (x) / 2)
#define SMARTFAN_EN_SHIFT(x) ((x) % 2 * 4)
and then use those defines instead of hard-coding the expressions multiple times. Actually, since REG_SMARTFAN_BASE is then only used once, you could just make it
#define REG_SMARTFAN_EN(x) (0x64 + (x) / 2)
Thanks,
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors