| 1 |
Author: dsd |
| 2 |
Date: 2008-12-05 14:36:12 +0000 (Fri, 05 Dec 2008) |
| 3 |
New Revision: 1419 |
| 4 |
|
| 5 |
Modified: |
| 6 |
genpatches-2.6/trunk/2.6.28/2900_IT8720-chipset-support-and-type-values-fix.patch |
| 7 |
Log: |
| 8 |
update for 2.6.28 |
| 9 |
|
| 10 |
Modified: genpatches-2.6/trunk/2.6.28/2900_IT8720-chipset-support-and-type-values-fix.patch |
| 11 |
=================================================================== |
| 12 |
--- genpatches-2.6/trunk/2.6.28/2900_IT8720-chipset-support-and-type-values-fix.patch 2008-12-05 00:43:09 UTC (rev 1418) |
| 13 |
+++ genpatches-2.6/trunk/2.6.28/2900_IT8720-chipset-support-and-type-values-fix.patch 2008-12-05 14:36:12 UTC (rev 1419) |
| 14 |
@@ -1,8 +1,8 @@ |
| 15 |
From: Jean-Marc Spaggiari <jean-marc@×××××××××.org> |
| 16 |
-Date: Mon, 27 Oct 2008 23:32:00 +0000 (+1100) |
| 17 |
+Date: Mon, 1 Dec 2008 22:24:31 +0000 (+1100) |
| 18 |
Subject: hwmon: (it87) Add support for the ITE IT8720F |
| 19 |
-X-Git-Tag: next-20081028~38^2 |
| 20 |
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fsfr%2Flinux-next.git;a=commitdiff_plain;h=47fd550939fc9f1dd0a20a59d4db83f9b7a164ad |
| 21 |
+X-Git-Tag: next-20081203~53^2~6 |
| 22 |
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fsfr%2Flinux-next.git;a=commitdiff_plain;h=19ec1c4104174bdfb04ddbb09546a1b4bc64f6c2 |
| 23 |
|
| 24 |
hwmon: (it87) Add support for the ITE IT8720F |
| 25 |
|
| 26 |
@@ -74,10 +74,10 @@ |
| 27 |
the mainboard and/or processor itself. It is a value in volts. |
| 28 |
|
| 29 |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig |
| 30 |
-index 032593b..9551e40 100644 |
| 31 |
+index 2be02d3..e6e2b7d 100644 |
| 32 |
--- a/drivers/hwmon/Kconfig |
| 33 |
+++ b/drivers/hwmon/Kconfig |
| 34 |
-@@ -389,7 +389,8 @@ config SENSORS_IT87 |
| 35 |
+@@ -399,7 +399,8 @@ config SENSORS_IT87 |
| 36 |
select HWMON_VID |
| 37 |
help |
| 38 |
If you say yes here you get support for ITE IT8705F, IT8712F, |
| 39 |
@@ -205,75 +205,3 @@ |
| 40 |
module_param(update_vbat, bool, 0); |
| 41 |
MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value"); |
| 42 |
module_param(fix_pwm_polarity, bool, 0); |
| 43 |
- |
| 44 |
-From: Jean Delvare <khali@××××××××.org> |
| 45 |
-Date: Fri, 17 Oct 2008 15:51:16 +0000 (+0200) |
| 46 |
-Subject: hwmon: (it87) Fix thermal sensor type values |
| 47 |
-X-Git-Tag: v2.6.28-rc1~259^2~18 |
| 48 |
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4ed1077953f531b3fef4af4b4ade48a828c48869 |
| 49 |
- |
| 50 |
-hwmon: (it87) Fix thermal sensor type values |
| 51 |
- |
| 52 |
-The it87 driver doesn't follow the standard sensor type values as |
| 53 |
-documented in Documentation/hwmon/sysfs-interface. It uses value 2 for |
| 54 |
-thermistors instead of value 4. This causes "sensors" to tell the user |
| 55 |
-that the chip is setup for a transistor while it is actually setup for |
| 56 |
-a thermistor. |
| 57 |
- |
| 58 |
-Using value 4 for thermistors solves the problem. For compatibility |
| 59 |
-reasons, we still accept value 2 but emit a warning message so that |
| 60 |
-users update their configuration files. |
| 61 |
- |
| 62 |
-Signed-off-by: Jean Delvare <khali@××××××××.org> |
| 63 |
-Acked-by: Hans de Goede <hdegoede@××××××.com> |
| 64 |
---- |
| 65 |
- |
| 66 |
-diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87 |
| 67 |
-index 3496b70..042c041 100644 |
| 68 |
---- a/Documentation/hwmon/it87 |
| 69 |
-+++ b/Documentation/hwmon/it87 |
| 70 |
-@@ -136,10 +136,10 @@ once-only alarms. |
| 71 |
- The IT87xx only updates its values each 1.5 seconds; reading it more often |
| 72 |
- will do no harm, but will return 'old' values. |
| 73 |
- |
| 74 |
--To change sensor N to a thermistor, 'echo 2 > tempN_type' where N is 1, 2, |
| 75 |
-+To change sensor N to a thermistor, 'echo 4 > tempN_type' where N is 1, 2, |
| 76 |
- or 3. To change sensor N to a thermal diode, 'echo 3 > tempN_type'. |
| 77 |
- Give 0 for unused sensor. Any other value is invalid. To configure this at |
| 78 |
--startup, consult lm_sensors's /etc/sensors.conf. (2 = thermistor; |
| 79 |
-+startup, consult lm_sensors's /etc/sensors.conf. (4 = thermistor; |
| 80 |
- 3 = thermal diode) |
| 81 |
- |
| 82 |
- |
| 83 |
-diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c |
| 84 |
-index d793cc0..b74c957 100644 |
| 85 |
---- a/drivers/hwmon/it87.c |
| 86 |
-+++ b/drivers/hwmon/it87.c |
| 87 |
-@@ -477,7 +477,7 @@ static ssize_t show_sensor(struct device *dev, struct device_attribute *attr, |
| 88 |
- if (reg & (1 << nr)) |
| 89 |
- return sprintf(buf, "3\n"); /* thermal diode */ |
| 90 |
- if (reg & (8 << nr)) |
| 91 |
-- return sprintf(buf, "2\n"); /* thermistor */ |
| 92 |
-+ return sprintf(buf, "4\n"); /* thermistor */ |
| 93 |
- return sprintf(buf, "0\n"); /* disabled */ |
| 94 |
- } |
| 95 |
- static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, |
| 96 |
-@@ -493,10 +493,15 @@ static ssize_t set_sensor(struct device *dev, struct device_attribute *attr, |
| 97 |
- |
| 98 |
- data->sensor &= ~(1 << nr); |
| 99 |
- data->sensor &= ~(8 << nr); |
| 100 |
-- /* 3 = thermal diode; 2 = thermistor; 0 = disabled */ |
| 101 |
-+ if (val == 2) { /* backwards compatibility */ |
| 102 |
-+ dev_warn(dev, "Sensor type 2 is deprecated, please use 4 " |
| 103 |
-+ "instead\n"); |
| 104 |
-+ val = 4; |
| 105 |
-+ } |
| 106 |
-+ /* 3 = thermal diode; 4 = thermistor; 0 = disabled */ |
| 107 |
- if (val == 3) |
| 108 |
- data->sensor |= 1 << nr; |
| 109 |
-- else if (val == 2) |
| 110 |
-+ else if (val == 4) |
| 111 |
- data->sensor |= 8 << nr; |
| 112 |
- else if (val != 0) { |
| 113 |
- mutex_unlock(&data->update_lock); |
| 114 |
- |
Archives