From 9827929f7415615bfe7b47d4d38d776997490e36 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 16 Dec 2010 12:49:58 +0100 Subject: [PATCH] lm_sensors: add some upstream patches Signed-off-by: Stephan Raue --- .../lm_sensors-3.2.0-changeset_5870.patch | 22 ++++++++++ .../lm_sensors-3.2.0-changeset_5883.patch | 12 ++++++ .../lm_sensors-3.2.0-changeset_5886.patch | 40 +++++++++++++++++++ .../lm_sensors-3.2.0-changeset_5887.patch | 12 ++++++ .../lm_sensors-3.2.0-changeset_5889.patch | 35 ++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5870.patch create mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5883.patch create mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5886.patch create mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5887.patch create mode 100644 packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5889.patch diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5870.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5870.patch new file mode 100644 index 0000000000..9a6567f7c1 --- /dev/null +++ b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5870.patch @@ -0,0 +1,22 @@ +diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES +--- lm_sensors-3.2.0-old/CHANGES 2010-10-10 12:15:54.000000000 -0700 ++++ lm_sensors-3.2.0-new/CHANGES 2010-10-19 20:13:47.000000000 -0700 +@@ -2,6 +2,7 @@ + ----------------------- + + 3.2.0 (2010-10-10) ++ sensors-detect: Fix error seen if I2C bus numbers are not sequential + libsensors: Increase MAX_SENSORS_PER_TYPE to 24 + Map individual beep features + Change license to LGPL +diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect +--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2010-09-21 08:21:05.000000000 -0700 ++++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2010-10-19 20:13:47.000000000 -0700 +@@ -5930,6 +5930,7 @@ + # the adapter drivers so that the numbers will be the same. If not, then + # we only load the adapter drivers which are useful. + foreach $adap (@i2c_adapters) { ++ next unless defined $adap; + next if $adap->{autoload}; + next if $adap->{driver} eq 'UNKNOWN'; + next if not defined $configfile and not $adap->{used}; diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5883.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5883.patch new file mode 100644 index 0000000000..6a1e319ad6 --- /dev/null +++ b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5883.patch @@ -0,0 +1,12 @@ +diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect +--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2010-11-21 07:20:09.000000000 -0800 ++++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2010-11-21 07:21:05.000000000 -0800 +@@ -1791,7 +1791,7 @@ + features => FEAT_IN | FEAT_FAN | FEAT_TEMP, + }, { + name => "Nuvoton W83667HG-B Super IO Sensors", +- driver => "to-be-written", # Probably w83627ehf ++ driver => "w83627ehf", + devid => 0xB350, + devid_mask => 0xFFF0, + logdev => 0x0b, diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5886.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5886.patch new file mode 100644 index 0000000000..04e6a25d4c --- /dev/null +++ b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5886.patch @@ -0,0 +1,40 @@ +diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES +--- lm_sensors-3.2.0-old/CHANGES 2010-11-29 10:42:35.000000000 -0800 ++++ lm_sensors-3.2.0-new/CHANGES 2010-11-29 10:43:06.000000000 -0800 +@@ -4,6 +4,7 @@ + 3.2.0 (2010-10-10) + sensors-detect: Fix error seen if I2C bus numbers are not sequential + libsensors: Increase MAX_SENSORS_PER_TYPE to 24 ++ sensors.conf.defauit: Add a section for the W83627THF + Map individual beep features + Change license to LGPL + pwmconfig: Sample all fan speeds before returning to full speed (#2380) +diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default +--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2010-07-04 00:22:11.000000000 -0700 ++++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2010-11-29 10:43:06.000000000 -0800 +@@ -266,6 +266,25 @@ + label temp1 "M/B Temp" + + ++chip "w83627thf-*" ++ ++ label in3 "+5V" ++ label in7 "5VSB" ++ label in8 "Vbat" ++ ++ # Internal resistors ++ compute in3 @ * (1 + 34/51), @ / (1 + 34/51) ++ compute in7 @ * (1 + 34/51), @ / (1 + 34/51) ++ ++ set in3_min 5.0 * 0.90 ++ set in3_max 5.0 * 1.10 ++ set in7_min 5.0 * 0.90 ++ set in7_max 5.0 * 1.10 ++# The battery voltage may or may not be monitored. ++# set in8_min 3.0 * 0.90 ++# set in8_max 3.0 * 1.10 ++ ++ + chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" + + label in0 "Vcore" diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5887.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5887.patch new file mode 100644 index 0000000000..458f0f3263 --- /dev/null +++ b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5887.patch @@ -0,0 +1,12 @@ +diff -Naur lm_sensors-3.2.0-old/lib/sensors.conf.5 lm_sensors-3.2.0-new/lib/sensors.conf.5 +--- lm_sensors-3.2.0-old/lib/sensors.conf.5 2009-02-15 09:22:38.000000000 -0800 ++++ lm_sensors-3.2.0-new/lib/sensors.conf.5 2010-12-13 18:45:54.000000000 -0800 +@@ -402,7 +402,7 @@ + again immediately. + + So, in addition to tempX_max, many chips have a tempX_max_hyst +-sub-feature. Likewise, tempX_crit often comes with tempX_max_crit. ++sub-feature. Likewise, tempX_crit often comes with tempX_crit_hyst. + Example: + + .RS diff --git a/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5889.patch b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5889.patch new file mode 100644 index 0000000000..6d41dbca93 --- /dev/null +++ b/packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5889.patch @@ -0,0 +1,35 @@ +diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES +--- lm_sensors-3.2.0-old/CHANGES 2010-12-13 18:45:21.000000000 -0800 ++++ lm_sensors-3.2.0-new/CHANGES 2010-12-13 18:46:50.000000000 -0800 +@@ -5,6 +5,7 @@ + sensors-detect: Fix error seen if I2C bus numbers are not sequential + libsensors: Increase MAX_SENSORS_PER_TYPE to 24 + sensors.conf.defauit: Add a section for the W83627THF ++ Add a section for the SCH5127 + Map individual beep features + Change license to LGPL + pwmconfig: Sample all fan speeds before returning to full speed (#2380) +diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default +--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2010-12-13 18:45:21.000000000 -0800 ++++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2010-12-13 18:46:50.000000000 -0800 +@@ -402,6 +402,20 @@ + set in6_max 3.0 * 1.10 + + ++chip "sch5127-*" ++ ++ label in2 "+3.3V" ++ label in5 "3VSB" ++ label in6 "Vbat" ++ ++ set in2_min 3.3 * 0.90 ++ set in2_max 3.3 * 1.10 ++ set in5_min 3.3 * 0.90 ++ set in5_max 3.3 * 1.10 ++ set in6_min 3.0 * 0.90 ++ set in6_max 3.0 * 1.10 ++ ++ + chip "f71882fg-*" + + label in0 "+3.3V"