Skip to content

Commit 4814241

Browse files
committed
hwmon: (amc6821) Add support for pwm1_mode attribute
AMC6821 supports configuring if a fan is DC or PWM controlled. Add support for the pwm1_mode attribute to make it runtime configurable. Reviewed-by: Quentin Schulz <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
1 parent e98ab50 commit 4814241

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

Documentation/hwmon/amc6821.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pwm1_enable rw regulator mode, 1=open loop, 2=fan controlled
5858
remote-sensor temperature,
5959
4=fan controlled by target rpm set with
6060
fan1_target attribute.
61+
pwm1_mode rw Fan duty control mode (0=DC, 1=PWM)
6162
pwm1_auto_channels_temp ro 1 if pwm_enable==2, 3 if pwm_enable==3
6263
pwm1_auto_point1_pwm ro Hardwired to 0, shared for both
6364
temperature channels.

drivers/hwmon/amc6821.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@ static int amc6821_pwm_read(struct device *dev, u32 attr, long *val)
312312
break;
313313
}
314314
return 0;
315+
case hwmon_pwm_mode:
316+
err = regmap_read(regmap, AMC6821_REG_CONF2, &regval);
317+
if (err)
318+
return err;
319+
*val = !!(regval & AMC6821_CONF2_TACH_MODE);
320+
return 0;
315321
case hwmon_pwm_auto_channels_temp:
316322
err = regmap_read(regmap, AMC6821_REG_CONF1, &regval);
317323
if (err)
@@ -367,6 +373,13 @@ static int amc6821_pwm_write(struct device *dev, u32 attr, long val)
367373
return regmap_update_bits(regmap, AMC6821_REG_CONF1,
368374
AMC6821_CONF1_FDRC0 | AMC6821_CONF1_FDRC1,
369375
mode);
376+
case hwmon_pwm_mode:
377+
if (val < 0 || val > 1)
378+
return -EINVAL;
379+
return regmap_update_bits(regmap, AMC6821_REG_CONF2,
380+
AMC6821_CONF2_TACH_MODE,
381+
val ? AMC6821_CONF2_TACH_MODE : 0);
382+
break;
370383
case hwmon_pwm_input:
371384
if (val < 0 || val > 255)
372385
return -EINVAL;
@@ -748,6 +761,7 @@ static umode_t amc6821_is_visible(const void *data,
748761
}
749762
case hwmon_pwm:
750763
switch (attr) {
764+
case hwmon_pwm_mode:
751765
case hwmon_pwm_enable:
752766
case hwmon_pwm_input:
753767
return 0644;
@@ -774,7 +788,7 @@ static const struct hwmon_channel_info * const amc6821_info[] = {
774788
HWMON_F_INPUT | HWMON_F_MIN | HWMON_F_MAX |
775789
HWMON_F_TARGET | HWMON_F_PULSES | HWMON_F_FAULT),
776790
HWMON_CHANNEL_INFO(pwm,
777-
HWMON_PWM_INPUT | HWMON_PWM_ENABLE |
791+
HWMON_PWM_INPUT | HWMON_PWM_ENABLE | HWMON_PWM_MODE |
778792
HWMON_PWM_AUTO_CHANNELS_TEMP),
779793
NULL
780794
};

0 commit comments

Comments
 (0)