diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-14 11:35:02 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-14 11:35:02 -0800 |
commit | 371cbd72de3723629c9b9ff10364fbfd73154554 (patch) | |
tree | 208d39c3b96e0afe178b18cbad7dcbe057248217 /i2c | |
parent | fbbb494e404c3fa20bbbb1e49843443bb3be155a (diff) | |
download | patches-371cbd72de3723629c9b9ff10364fbfd73154554.tar.gz |
2.6.16-rc3-git3 refresh
Diffstat (limited to 'i2c')
-rw-r--r-- | i2c/hwmon-vt8231-temp-hyst.patch | 54 | ||||
-rw-r--r-- | i2c/hwmon-w83627hf-document-reset-param.patch | 30 | ||||
-rw-r--r-- | i2c/hwmon-w83781d-real-time-alarms.patch | 90 | ||||
-rw-r--r-- | i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch | 50 | ||||
-rw-r--r-- | i2c/it87-fix-oops-on-removal.patch | 29 |
5 files changed, 0 insertions, 253 deletions
diff --git a/i2c/hwmon-vt8231-temp-hyst.patch b/i2c/hwmon-vt8231-temp-hyst.patch deleted file mode 100644 index 76c2f378951c5..0000000000000 --- a/i2c/hwmon-vt8231-temp-hyst.patch +++ /dev/null @@ -1,54 +0,0 @@ -From khali@linux-fr.org Sun Feb 5 14:10:35 2006 -Date: Sun, 5 Feb 2006 23:11:16 +0100 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <greg@kroah.com> -Cc: Roger Lucas <roger@planbit.co.uk> -Subject: [PATCH 01/11] vt8231: Fix sysfs temperature interface -Message-Id: <20060205231116.77c054e0.khali@linux-fr.org> -Content-Disposition: inline; filename=hwmon-vt8231-temp-hyst.patch - -The VT8231 low temperature limits are actually hysteresis temperatures -to the high limits. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Cc: Roger Lucas <roger@planbit.co.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/hwmon/vt8231.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- gregkh-2.6.orig/drivers/hwmon/vt8231.c -+++ gregkh-2.6/drivers/hwmon/vt8231.c -@@ -437,12 +437,12 @@ static SENSOR_DEVICE_ATTR(temp##offset## - show_temp, NULL, offset - 1); \ - static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ - show_temp_max, set_temp_max, offset - 1); \ --static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ -+static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR, \ - show_temp_min, set_temp_min, offset - 1) - - static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp0, NULL); - static DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp0_max, set_temp0_max); --static DEVICE_ATTR(temp1_min, S_IRUGO | S_IWUSR, show_temp0_min, set_temp0_min); -+static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp0_min, set_temp0_min); - - define_temperature_sysfs(2); - define_temperature_sysfs(3); -@@ -451,7 +451,7 @@ define_temperature_sysfs(5); - define_temperature_sysfs(6); - - #define CFG_INFO_TEMP(id) { &sensor_dev_attr_temp##id##_input.dev_attr, \ -- &sensor_dev_attr_temp##id##_min.dev_attr, \ -+ &sensor_dev_attr_temp##id##_max_hyst.dev_attr, \ - &sensor_dev_attr_temp##id##_max.dev_attr } - #define CFG_INFO_VOLT(id) { &sensor_dev_attr_in##id##_input.dev_attr, \ - &sensor_dev_attr_in##id##_min.dev_attr, \ -@@ -464,7 +464,7 @@ struct str_device_attr_table { - }; - - static struct str_device_attr_table cfg_info_temp[] = { -- { &dev_attr_temp1_input, &dev_attr_temp1_min, &dev_attr_temp1_max }, -+ { &dev_attr_temp1_input, &dev_attr_temp1_max_hyst, &dev_attr_temp1_max }, - CFG_INFO_TEMP(2), - CFG_INFO_TEMP(3), - CFG_INFO_TEMP(4), diff --git a/i2c/hwmon-w83627hf-document-reset-param.patch b/i2c/hwmon-w83627hf-document-reset-param.patch deleted file mode 100644 index 033a39302da4f..0000000000000 --- a/i2c/hwmon-w83627hf-document-reset-param.patch +++ /dev/null @@ -1,30 +0,0 @@ -From khali@linux-fr.org Sun Feb 5 14:16:49 2006 -Date: Sun, 5 Feb 2006 23:17:34 +0100 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <greg@kroah.com> -Subject: [PATCH 03/11] w83627hf: Document the reset module parameter -Message-Id: <20060205231734.3ec8f2e6.khali@linux-fr.org> -Content-Disposition: inline; filename=hwmon-w83627hf-document-reset-param.patch - -Document the reset module parameter which was recently added to the -w83627hf driver. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - Documentation/hwmon/w83627hf | 4 ++++ - 1 file changed, 4 insertions(+) - ---- gregkh-2.6.orig/Documentation/hwmon/w83627hf -+++ gregkh-2.6/Documentation/hwmon/w83627hf -@@ -36,6 +36,10 @@ Module Parameters - (default is 1) - Use 'init=0' to bypass initializing the chip. - Try this if your computer crashes when you load the module. -+* reset: int -+ (default is 0) -+ The driver used to reset the chip on load, but does no more. Use -+ 'reset=1' to restore the old behavior. Report if you need to do this. - - Description - ----------- diff --git a/i2c/hwmon-w83781d-real-time-alarms.patch b/i2c/hwmon-w83781d-real-time-alarms.patch deleted file mode 100644 index 21c25cf7d44f1..0000000000000 --- a/i2c/hwmon-w83781d-real-time-alarms.patch +++ /dev/null @@ -1,90 +0,0 @@ -From khali@linux-fr.org Sun Feb 5 14:13:04 2006 -Date: Sun, 5 Feb 2006 23:13:48 +0100 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <greg@kroah.com> -Subject: [PATCH 02/11] w83781d: Use real-time status registers -Message-Id: <20060205231348.1e273c69.khali@linux-fr.org> -Content-Disposition: inline; filename=hwmon-w83781d-real-time-alarms.patch - -Use the real-time status registers of the Winbond W83782D, W83783S and -W83627HF chips, instead of the interrupt status registers. Interrupts -cannot be trusted at least for voltage inputs, as they are two-times -triggers (as opposed to comparator mode, which we want.) The w83627hf -driver was fixed in a similar way some times ago. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/hwmon/w83781d.c | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - ---- gregkh-2.6.orig/drivers/hwmon/w83781d.c -+++ gregkh-2.6/drivers/hwmon/w83781d.c -@@ -95,11 +95,16 @@ MODULE_PARM_DESC(init, "Set to zero to b - (0x39))) - - #define W83781D_REG_CONFIG 0x40 -+ -+/* Interrupt status (W83781D, AS99127F) */ - #define W83781D_REG_ALARM1 0x41 - #define W83781D_REG_ALARM2 0x42 --#define W83781D_REG_ALARM3 0x450 /* not on W83781D */ - --#define W83781D_REG_IRQ 0x4C -+/* Real-time status (W83782D, W83783S, W83627HF) */ -+#define W83782D_REG_ALARM1 0x459 -+#define W83782D_REG_ALARM2 0x45A -+#define W83782D_REG_ALARM3 0x45B -+ - #define W83781D_REG_BEEP_CONFIG 0x4D - #define W83781D_REG_BEEP_INTS1 0x56 - #define W83781D_REG_BEEP_INTS2 0x57 -@@ -1513,15 +1518,6 @@ w83781d_init_client(struct i2c_client *c - W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); - } - } -- -- if (type != w83781d) { -- /* enable comparator mode for temp2 and temp3 so -- alarm indication will work correctly */ -- i = w83781d_read_value(client, W83781D_REG_IRQ); -- if (!(i & 0x40)) -- w83781d_write_value(client, W83781D_REG_IRQ, -- i | 0x40); -- } - } - - /* Start monitoring */ -@@ -1612,14 +1608,25 @@ static struct w83781d_data *w83781d_upda - data->fan_div[1] |= (i >> 4) & 0x04; - data->fan_div[2] |= (i >> 5) & 0x04; - } -- data->alarms = -- w83781d_read_value(client, -- W83781D_REG_ALARM1) + -- (w83781d_read_value(client, W83781D_REG_ALARM2) << 8); - if ((data->type == w83782d) || (data->type == w83627hf)) { -- data->alarms |= -- w83781d_read_value(client, -- W83781D_REG_ALARM3) << 16; -+ data->alarms = w83781d_read_value(client, -+ W83782D_REG_ALARM1) -+ | (w83781d_read_value(client, -+ W83782D_REG_ALARM2) << 8) -+ | (w83781d_read_value(client, -+ W83782D_REG_ALARM3) << 16); -+ } else if (data->type == w83783s) { -+ data->alarms = w83781d_read_value(client, -+ W83782D_REG_ALARM1) -+ | (w83781d_read_value(client, -+ W83782D_REG_ALARM2) << 8); -+ } else { -+ /* No real-time status registers, fall back to -+ interrupt status registers */ -+ data->alarms = w83781d_read_value(client, -+ W83781D_REG_ALARM1) -+ | (w83781d_read_value(client, -+ W83781D_REG_ALARM2) << 8); - } - i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2); - data->beep_enable = i >> 7; diff --git a/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch b/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch deleted file mode 100644 index 599705e639bdd..0000000000000 --- a/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch +++ /dev/null @@ -1,50 +0,0 @@ -From khali@linux-fr.org Mon Feb 13 20:21:05 2006 -Date: Wed, 8 Feb 2006 20:38:29 +0100 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <greg@kroah.com> -Cc: Nicolas Mailhot <nicolas.mailhot@laposte.net> -Subject: i2c: Drop outdated probe/remove code in i2c-isa -Message-Id: <20060208203829.694cd90b.khali@linux-fr.org> - -Probe and remove methods are now defined at bus level. No more need to -redefine them at driver level in i2c-isa. - -This lets us get rid of these annoying messages: -Driver 'it87-isa' needs updating - please use bus_type methods - -Thanks to Nicolas Mailhot for reporting the problem and testing the fix. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/i2c/busses/i2c-isa.c | 12 ------------ - 1 file changed, 12 deletions(-) - ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-isa.c -+++ gregkh-2.6/drivers/i2c/busses/i2c-isa.c -@@ -72,16 +72,6 @@ static ssize_t show_adapter_name(struct - } - static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL); - --static int i2c_isa_device_probe(struct device *dev) --{ -- return -ENODEV; --} -- --static int i2c_isa_device_remove(struct device *dev) --{ -- return 0; --} -- - - /* We implement an interface which resembles i2c_{add,del}_driver, - but for i2c-isa drivers. We don't have to remember and handle lists -@@ -93,8 +83,6 @@ int i2c_isa_add_driver(struct i2c_driver - - /* Add the driver to the list of i2c drivers in the driver core */ - driver->driver.bus = &i2c_bus_type; -- driver->driver.probe = i2c_isa_device_probe; -- driver->driver.remove = i2c_isa_device_remove; - res = driver_register(&driver->driver); - if (res) - return res; diff --git a/i2c/it87-fix-oops-on-removal.patch b/i2c/it87-fix-oops-on-removal.patch deleted file mode 100644 index 1268a58c902ac..0000000000000 --- a/i2c/it87-fix-oops-on-removal.patch +++ /dev/null @@ -1,29 +0,0 @@ -From khali@linux-fr.org Tue Feb 7 08:52:59 2006 -Date: Tue, 7 Feb 2006 17:53:32 +0100 -From: Jean Delvare <khali@linux-fr.org> -To: Greg KH <greg@kroah.com> -Subject: [PATCH] it87: Fix oops on removal -Message-Id: <20060207175332.3c1be7ba.khali@linux-fr.org> - -Fix an oops on it87 module removal when no supported hardware was -found. - -Signed-off-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/hwmon/it87.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/hwmon/it87.c -+++ gregkh-2.6/drivers/hwmon/it87.c -@@ -1186,7 +1186,8 @@ static int __init sm_it87_init(void) - - static void __exit sm_it87_exit(void) - { -- i2c_isa_del_driver(&it87_isa_driver); -+ if (isa_address) -+ i2c_isa_del_driver(&it87_isa_driver); - i2c_del_driver(&it87_driver); - } - |