---

yaml --- r: 363042 b: refs/heads/master c: bbd8dec h: refs/heads/master v: v3
git-mirror · Apr 8, 2013 · 2ad4e09 · 2ad4e09
1 parent 964130d
commit 2ad4e09
Show file tree

Hide file tree

Showing 3 changed files with 286 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdcaeceb74ff3686eb25de6812870fbc765c3c39
+refs/heads/master: bbd8decd4123648ddeba2be485bc7e1a3117bfe4
diff --git a/trunk/Documentation/hwmon/nct6775 b/trunk/Documentation/hwmon/nct6775
@@ -92,6 +92,25 @@ Common fan control attributes
 
 pwm[1-5]_temp_sel	Temperature source. Value is temperature sensor index.
 			For example, select '1' for temp1_input.
+pwm[1-5]_weight_temp_sel
+			Secondary temperature source. Value is temperature
+			sensor index. For example, select '1' for temp1_input.
+			Set to 0 to disable secondary temperature control.
+
+If secondary temperature functionality is enabled, it is controlled with the
+following attributes.
+
+pwm[1-5]_weight_duty_step
+			Duty step size.
+pwm[1-5]_weight_temp_step
+			Temperature step size. With each step over
+			temp_step_base, the value of weight_duty_step is added
+			to the current pwm value.
+pwm[1-5]_weight_temp_step_base
+			Temperature at which secondary temperature control kicks
+			in.
+pwm[1-5]_weight_temp_step_tol
+			Temperature step tolerance.
 
 Thermal Cruise mode (2)
 -----------------------