diff options
author | Greg KH <greg@press.(none)> | 2005-10-05 14:58:10 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-05 14:58:10 -0700 |
commit | b9b47fcb11352c2184299be5d622b9e7a6105b89 (patch) | |
tree | 664ec55b63d2576e9fd1f532a400799f0d5924d3 /i2c | |
parent | 454030824a7a721df03527bc3475315c08b4898c (diff) | |
download | patches-b9b47fcb11352c2184299be5d622b9e7a6105b89.tar.gz |
refresh of patches
Diffstat (limited to 'i2c')
-rw-r--r-- | i2c/hwmon-01.patch | 23 | ||||
-rw-r--r-- | i2c/hwmon-02.patch | 17 | ||||
-rw-r--r-- | i2c/hwmon-03.patch | 49 | ||||
-rw-r--r-- | i2c/hwmon-04.patch | 11 | ||||
-rw-r--r-- | i2c/hwmon-05.patch | 31 | ||||
-rw-r--r-- | i2c/hwmon-06.patch | 105 | ||||
-rw-r--r-- | i2c/hwmon-07.patch | 13 | ||||
-rw-r--r-- | i2c/hwmon-08.patch | 9 | ||||
-rw-r--r-- | i2c/hwmon-09.patch | 9 | ||||
-rw-r--r-- | i2c/hwmon-10.patch | 7 | ||||
-rw-r--r-- | i2c/hwmon-11.patch | 7 | ||||
-rw-r--r-- | i2c/hwmon-12.patch | 7 | ||||
-rw-r--r-- | i2c/hwmon-13.patch | 11 | ||||
-rw-r--r-- | i2c/hwmon-adm9240-update-01.patch | 4 | ||||
-rw-r--r-- | i2c/hwmon-adm9240-update-02.patch | 4 | ||||
-rw-r--r-- | i2c/hwmon-via686a-save-memory.patch | 4 | ||||
-rw-r--r-- | i2c/i2c-device-id.patch | 16 | ||||
-rw-r--r-- | i2c/i2c-viapro-01.patch | 4 | ||||
-rw-r--r-- | i2c/i2c-viapro-02.patch | 35 | ||||
-rw-r--r-- | i2c/i2c-viapro-03.patch | 27 | ||||
-rw-r--r-- | i2c/i2c-viapro-04.patch | 33 | ||||
-rw-r--r-- | i2c/i2c-viapro-05.patch | 11 | ||||
-rw-r--r-- | i2c/i2c-viapro-06.patch | 11 | ||||
-rw-r--r-- | i2c/i2c-viapro-07.patch | 11 | ||||
-rw-r--r-- | i2c/i2c-viapro-08.patch | 11 |
25 files changed, 245 insertions, 225 deletions
diff --git a/i2c/hwmon-01.patch b/i2c/hwmon-01.patch index 1f060a7abdb4de..a555009b37c7a1 100644 --- a/i2c/hwmon-01.patch +++ b/i2c/hwmon-01.patch @@ -17,9 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/adm9240.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/adm9240.c 2005-09-26 14:47:18.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/adm9240.c 2005-09-26 14:47:29.000000000 -0700 -@@ -219,8 +219,8 @@ +--- +--- gregkh-2.6.orig/drivers/hwmon/adm9240.c ++++ gregkh-2.6/drivers/hwmon/adm9240.c +@@ -219,8 +219,8 @@ static ssize_t show_in(struct device *de attr->index)); } @@ -30,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct adm9240_data *data = adm9240_update_device(dev); -@@ -228,8 +228,8 @@ +@@ -228,8 +228,8 @@ static ssize_t show_in_min(struct device attr->index)); } @@ -41,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct adm9240_data *data = adm9240_update_device(dev); -@@ -237,7 +237,8 @@ +@@ -237,7 +237,8 @@ static ssize_t show_in_max(struct device attr->index)); } @@ -51,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *buf, size_t count) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); -@@ -253,7 +254,8 @@ +@@ -253,7 +254,8 @@ static ssize_t set_in_min(struct device return count; } @@ -61,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *buf, size_t count) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); -@@ -326,7 +328,7 @@ +@@ -326,7 +328,7 @@ static void adm9240_write_fan_div(struct "to %u\n", nr + 1, 1 << old, 1 << fan_div); } @@ -70,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * set fan speed low limit: * * - value is zero: disable fan speed low limit alarm -@@ -404,7 +406,8 @@ +@@ -404,7 +406,8 @@ fan(1); fan(2); /* alarms */ @@ -80,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct adm9240_data *data = adm9240_update_device(dev); return sprintf(buf, "%u\n", data->alarms); -@@ -412,7 +415,8 @@ +@@ -412,7 +415,8 @@ static ssize_t show_alarms(struct device static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); /* vid */ @@ -90,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct adm9240_data *data = adm9240_update_device(dev); return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm)); -@@ -420,13 +424,16 @@ +@@ -420,13 +424,16 @@ static ssize_t show_vid(struct device *d static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); /* analog output */ @@ -109,7 +110,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct i2c_client *client = to_i2c_client(dev); struct adm9240_data *data = i2c_get_clientdata(client); -@@ -441,7 +448,9 @@ +@@ -441,7 +448,9 @@ static ssize_t set_aout(struct device *d static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout); /* chassis_clear */ diff --git a/i2c/hwmon-02.patch b/i2c/hwmon-02.patch index 2ecc7f772911e7..9d1703709d262a 100644 --- a/i2c/hwmon-02.patch +++ b/i2c/hwmon-02.patch @@ -25,9 +25,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/via686a.c | 18 +++++++++++------- 2 files changed, 26 insertions(+), 9 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/via686a.c 2005-09-26 14:45:49.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/via686a.c 2005-09-26 14:47:43.000000000 -0700 -@@ -589,10 +589,8 @@ +--- +--- gregkh-2.6.orig/drivers/hwmon/via686a.c ++++ gregkh-2.6/drivers/hwmon/via686a.c +@@ -589,10 +589,8 @@ static int via686a_detect(struct i2c_ada u16 val; /* 8231 requires multiple of 256, we enforce that on 686 as well */ @@ -39,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_warn(&adapter->dev, "forcing ISA address 0x%04X\n", address); if (PCIBIOS_SUCCESSFUL != -@@ -603,11 +601,17 @@ +@@ -603,11 +601,17 @@ static int via686a_detect(struct i2c_ada pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val)) return -ENODEV; if (!(val & 0x0001)) { @@ -61,9 +62,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Reserve the ISA region */ ---- gregkh-2.6.orig/Documentation/hwmon/via686a 2005-08-28 16:41:01.000000000 -0700 -+++ gregkh-2.6/Documentation/hwmon/via686a 2005-09-26 14:47:44.000000000 -0700 -@@ -18,8 +18,9 @@ +--- gregkh-2.6.orig/Documentation/hwmon/via686a ++++ gregkh-2.6/Documentation/hwmon/via686a +@@ -18,8 +18,9 @@ Authors: Module Parameters ----------------- @@ -75,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> PCI force; the via686a must still be present in lspci. Don't use this unless the driver complains that the base address is not set. -@@ -63,3 +64,15 @@ +@@ -63,3 +64,15 @@ miss once-only alarms. The driver only updates its values each 1.5 seconds; reading it more often will do no harm, but will return 'old' values. diff --git a/i2c/hwmon-03.patch b/i2c/hwmon-03.patch index 44d48763a6eda7..122960a7edc3aa 100644 --- a/i2c/hwmon-03.patch +++ b/i2c/hwmon-03.patch @@ -22,8 +22,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-via.c | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/algos/i2c-algo-pca.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/algos/i2c-algo-pca.c 2005-09-26 14:47:46.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/algos/i2c-algo-pca.c ++++ gregkh-2.6/drivers/i2c/algos/i2c-algo-pca.c @@ -34,7 +34,7 @@ #define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0) #define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0) @@ -33,8 +34,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define pca_outw(adap, reg, val) adap->write_byte(adap, reg, val) #define pca_inw(adap, reg) adap->read_byte(adap, reg) ---- gregkh-2.6.orig/drivers/i2c/algos/i2c-algo-sibyte.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/algos/i2c-algo-sibyte.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/algos/i2c-algo-sibyte.c ++++ gregkh-2.6/drivers/i2c/algos/i2c-algo-sibyte.c @@ -42,7 +42,7 @@ /* module parameters: @@ -44,8 +45,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali15x3.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-ali15x3.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali15x3.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-ali15x3.c @@ -125,12 +125,12 @@ /* If force_addr is set to anything different from 0, we forcibly enable @@ -61,8 +62,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int ali15x3_setup(struct pci_dev *ALI15X3_dev) { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd756.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-amd756.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd756.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-amd756.c @@ -86,7 +86,7 @@ #define AMD756_BLOCK_DATA 0x05 @@ -72,8 +73,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* SMBUS event = I/O 28-29 bit 11 ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-iop3xx.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-iop3xx.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-iop3xx.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-iop3xx.c @@ -43,7 +43,7 @@ #include "i2c-iop3xx.h" @@ -83,9 +84,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline unsigned char iic_cook_addr(struct i2c_msg *msg) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-piix4.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-piix4.c 2005-09-26 14:47:46.000000000 -0700 -@@ -90,13 +90,13 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-piix4.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-piix4.c +@@ -90,13 +90,13 @@ struct sd { /* If force is set to anything different from 0, we forcibly enable the PIIX4. DANGEROUS! */ @@ -101,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> module_param (force_addr, int, 0); MODULE_PARM_DESC(force_addr, "Forcibly enable the PIIX4 at the given address. " -@@ -104,14 +104,14 @@ +@@ -104,14 +104,14 @@ MODULE_PARM_DESC(force_addr, /* If fix_hstcfg is set to anything different from 0, we reset one of the registers to be a valid value. */ @@ -118,9 +119,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct i2c_adapter piix4_adapter; static struct dmi_system_id __devinitdata piix4_dmi_table[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis5595.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis5595.c 2005-09-26 14:47:46.000000000 -0700 -@@ -123,11 +123,11 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis5595.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis5595.c +@@ -123,11 +123,11 @@ static int blacklist[] = { /* If force_addr is set to anything different from 0, we forcibly enable the device at the given address. */ @@ -134,9 +135,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static u8 sis5595_read(u8 reg) { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis630.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis630.c 2005-09-26 14:47:46.000000000 -0700 -@@ -101,7 +101,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis630.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis630.c +@@ -101,7 +101,7 @@ module_param(force, bool, 0); MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!"); /* acpi base address */ @@ -145,8 +146,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* supported chips */ static int supported[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis96x.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis96x.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis96x.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis96x.c @@ -83,7 +83,7 @@ #define SIS96x_BLOCK_DATA 0x05 @@ -156,8 +157,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline u8 sis96x_read(u8 reg) { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-via.c 2005-08-28 16:41:01.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-via.c 2005-09-26 14:47:46.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-via.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-via.c @@ -45,7 +45,7 @@ #define IOSPACE 0x06 #define IOTEXT "via-i2c" diff --git a/i2c/hwmon-04.patch b/i2c/hwmon-04.patch index d781ee3adf9240..7f5301750501ca 100644 --- a/i2c/hwmon-04.patch +++ b/i2c/hwmon-04.patch @@ -14,9 +14,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/via686a.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/adm1021.c 2005-09-20 08:14:18.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/adm1021.c 2005-09-26 14:47:49.000000000 -0700 -@@ -121,7 +121,7 @@ +--- +--- gregkh-2.6.orig/drivers/hwmon/adm1021.c ++++ gregkh-2.6/drivers/hwmon/adm1021.c +@@ -121,7 +121,7 @@ static int adm1021_write_value(struct i2 static struct adm1021_data *adm1021_update_device(struct device *dev); /* (amalysh) read only mode, otherwise any limit's writing confuse BIOS */ @@ -25,8 +26,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* This is the driver that will be inserted */ ---- gregkh-2.6.orig/drivers/hwmon/via686a.c 2005-09-26 14:47:45.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/via686a.c 2005-09-26 14:47:49.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/via686a.c ++++ gregkh-2.6/drivers/hwmon/via686a.c @@ -44,7 +44,7 @@ /* If force_addr is set to anything different from 0, we forcibly enable diff --git a/i2c/hwmon-05.patch b/i2c/hwmon-05.patch index e0061d33366f32..f27ed930e7f550 100644 --- a/i2c/hwmon-05.patch +++ b/i2c/hwmon-05.patch @@ -20,9 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/w83792d.c | 1 - 5 files changed, 5 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/lm78.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/lm78.c 2005-09-26 14:47:51.000000000 -0700 -@@ -726,7 +726,6 @@ +--- +--- gregkh-2.6.orig/drivers/hwmon/lm78.c ++++ gregkh-2.6/drivers/hwmon/lm78.c +@@ -726,7 +726,6 @@ static int lm78_write_value(struct i2c_c return i2c_smbus_write_byte_data(client, reg, value); } @@ -30,9 +31,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void lm78_init_client(struct i2c_client *client) { u8 config = lm78_read_value(client, LM78_REG_CONFIG); ---- gregkh-2.6.orig/drivers/hwmon/via686a.c 2005-09-26 14:47:51.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/via686a.c 2005-09-26 14:47:51.000000000 -0700 -@@ -712,7 +712,6 @@ +--- gregkh-2.6.orig/drivers/hwmon/via686a.c ++++ gregkh-2.6/drivers/hwmon/via686a.c +@@ -712,7 +712,6 @@ static int via686a_detach_client(struct return 0; } @@ -40,9 +41,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void via686a_init_client(struct i2c_client *client) { u8 reg; ---- gregkh-2.6.orig/drivers/hwmon/w83627hf.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/w83627hf.c 2005-09-26 14:47:51.000000000 -0700 -@@ -1275,7 +1275,6 @@ +--- gregkh-2.6.orig/drivers/hwmon/w83627hf.c ++++ gregkh-2.6/drivers/hwmon/w83627hf.c +@@ -1275,7 +1275,6 @@ static int w83627hf_write_value(struct i return 0; } @@ -50,9 +51,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void w83627hf_init_client(struct i2c_client *client) { struct w83627hf_data *data = i2c_get_clientdata(client); ---- gregkh-2.6.orig/drivers/hwmon/w83781d.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/w83781d.c 2005-09-26 14:47:51.000000000 -0700 -@@ -1451,7 +1451,6 @@ +--- gregkh-2.6.orig/drivers/hwmon/w83781d.c ++++ gregkh-2.6/drivers/hwmon/w83781d.c +@@ -1451,7 +1451,6 @@ w83781d_write_value(struct i2c_client *c return 0; } @@ -60,9 +61,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void w83781d_init_client(struct i2c_client *client) { ---- gregkh-2.6.orig/drivers/hwmon/w83792d.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/w83792d.c 2005-09-26 14:47:51.000000000 -0700 -@@ -1429,7 +1429,6 @@ +--- gregkh-2.6.orig/drivers/hwmon/w83792d.c ++++ gregkh-2.6/drivers/hwmon/w83792d.c +@@ -1429,7 +1429,6 @@ w83792d_write_value(struct i2c_client *c return 0; } diff --git a/i2c/hwmon-06.patch b/i2c/hwmon-06.patch index 007f9f504c59d8..90185616bec3d8 100644 --- a/i2c/hwmon-06.patch +++ b/i2c/hwmon-06.patch @@ -29,8 +29,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-via.c | 4 ++-- 12 files changed, 33 insertions(+), 25 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali1535.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-ali1535.c 2005-09-26 14:48:02.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali1535.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-ali1535.c @@ -134,7 +134,7 @@ /* -> Read = 1 */ #define ALI1535_SMBIO_EN 0x04 /* SMB I/O Space enable */ @@ -40,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static unsigned short ali1535_smba; static DECLARE_MUTEX(i2c_ali1535_sem); -@@ -162,7 +162,8 @@ +@@ -162,7 +162,8 @@ static int ali1535_setup(struct pci_dev goto exit; } @@ -50,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n", ali1535_smba); goto exit; -@@ -480,7 +481,6 @@ +@@ -480,7 +481,6 @@ static struct i2c_adapter ali1535_adapte .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -58,9 +59,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct pci_device_id ali1535_ids[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali15x3.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-ali15x3.c 2005-09-26 14:48:02.000000000 -0700 -@@ -130,6 +130,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali15x3.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-ali15x3.c +@@ -130,6 +130,7 @@ module_param(force_addr, ushort, 0); MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller"); @@ -68,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static unsigned short ali15x3_smba; static int ali15x3_setup(struct pci_dev *ALI15X3_dev) -@@ -166,7 +167,8 @@ +@@ -166,7 +167,8 @@ static int ali15x3_setup(struct pci_dev if(force_addr) ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1); @@ -78,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&ALI15X3_dev->dev, "ALI15X3_smb region 0x%x already in use!\n", ali15x3_smba); -@@ -470,7 +472,6 @@ +@@ -470,7 +472,6 @@ static struct i2c_adapter ali15x3_adapte .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -86,8 +87,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct pci_device_id ali15x3_ids[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd756.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-amd756.c 2005-09-26 14:48:02.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd756.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-amd756.c @@ -85,7 +85,7 @@ #define AMD756_PROCESS_CALL 0x04 #define AMD756_BLOCK_DATA 0x05 @@ -97,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static unsigned short amd756_ioport; /* -@@ -303,7 +303,6 @@ +@@ -303,7 +303,6 @@ struct i2c_adapter amd756_smbus = { .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -105,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 }; -@@ -365,7 +364,7 @@ +@@ -365,7 +364,7 @@ static int __devinit amd756_probe(struct amd756_ioport += SMB_ADDR_OFFSET; } @@ -114,9 +115,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&pdev->dev, "SMB region 0x%x already in use!\n", amd756_ioport); return -ENODEV; ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-i801.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-i801.c 2005-09-26 14:48:02.000000000 -0700 -@@ -110,6 +110,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-i801.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-i801.c +@@ -110,6 +110,7 @@ static int i801_block_transaction(union char read_write, int command); static unsigned short i801_smba; @@ -124,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct pci_dev *I801_dev; static int isich4; -@@ -143,7 +144,7 @@ +@@ -143,7 +144,7 @@ static int i801_setup(struct pci_dev *de } } @@ -133,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&dev->dev, "I801_smb region 0x%x already in use!\n", i801_smba); error_return = -EBUSY; -@@ -543,7 +544,6 @@ +@@ -543,7 +544,6 @@ static struct i2c_adapter i801_adapter = .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -141,9 +142,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct pci_device_id i801_ids[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-nforce2.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-nforce2.c 2005-09-26 14:48:02.000000000 -0700 -@@ -97,6 +97,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-nforce2.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-nforce2.c +@@ -97,6 +97,7 @@ struct nforce2_smbus { #define NVIDIA_SMB_PRTCL_I2C_BLOCK_DATA 0x4a #define NVIDIA_SMB_PRTCL_PEC 0x80 @@ -151,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static s32 nforce2_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, char read_write, -@@ -113,7 +114,6 @@ +@@ -113,7 +114,6 @@ static struct i2c_adapter nforce2_adapte .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -159,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; /* Return -1 on error. See smbus.h for more information */ -@@ -285,7 +285,7 @@ +@@ -285,7 +285,7 @@ static int __devinit nforce2_probe_smb ( smbus->base = iobase & 0xfffc; smbus->size = 8; @@ -168,9 +169,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&smbus->adapter.dev, "Error requesting region %02x .. %02X for %s\n", smbus->base, smbus->base+smbus->size-1, name); return -1; ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-piix4.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-piix4.c 2005-09-26 14:48:02.000000000 -0700 -@@ -112,6 +112,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-piix4.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-piix4.c +@@ -112,6 +112,7 @@ MODULE_PARM_DESC(fix_hstcfg, static int piix4_transaction(void); static unsigned short piix4_smba; @@ -178,7 +179,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct i2c_adapter piix4_adapter; static struct dmi_system_id __devinitdata piix4_dmi_table[] = { -@@ -157,7 +158,7 @@ +@@ -157,7 +158,7 @@ static int __devinit piix4_setup(struct } } @@ -187,7 +188,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&PIIX4_dev->dev, "SMB region 0x%x already in use!\n", piix4_smba); return -ENODEV; -@@ -407,7 +408,6 @@ +@@ -407,7 +408,6 @@ static struct i2c_adapter piix4_adapter .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -195,9 +196,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct pci_device_id piix4_ids[] = { ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis5595.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis5595.c 2005-09-26 14:48:02.000000000 -0700 -@@ -127,6 +127,7 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis5595.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis5595.c +@@ -127,6 +127,7 @@ static u16 force_addr; module_param(force_addr, ushort, 0); MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller"); @@ -205,7 +206,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static unsigned short sis5595_base; static u8 sis5595_read(u8 reg) -@@ -172,7 +173,8 @@ +@@ -172,7 +173,8 @@ static int sis5595_setup(struct pci_dev /* NB: We grab just the two SMBus registers here, but this may still * interfere with ACPI :-( */ @@ -215,7 +216,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&SIS5595_dev->dev, "SMBus registers 0x%04x-0x%04x already in use!\n", sis5595_base + SMB_INDEX, sis5595_base + SMB_INDEX + 1); return -ENODEV; -@@ -364,7 +366,6 @@ +@@ -364,7 +366,6 @@ static struct i2c_algorithm smbus_algori static struct i2c_adapter sis5595_adapter = { .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, @@ -223,8 +224,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .algo = &smbus_algorithm, }; ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis630.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis630.c 2005-09-26 14:48:02.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis630.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis630.c @@ -92,6 +92,8 @@ #define SIS630_PCALL 0x04 #define SIS630_BLOCK_DATA 0x05 @@ -234,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* insmod parameters */ static int high_clock; static int force; -@@ -432,7 +434,8 @@ +@@ -432,7 +434,8 @@ static int sis630_setup(struct pci_dev * dev_dbg(&sis630_dev->dev, "ACPI base at 0x%04x\n", acpi_base); /* Everything is happy, let's grab the memory and set things up. */ @@ -244,7 +245,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&sis630_dev->dev, "SMBus registers 0x%04x-0x%04x already " "in use!\n", acpi_base + SMB_STS, acpi_base + SMB_SAA); goto exit; -@@ -455,7 +458,6 @@ +@@ -455,7 +458,6 @@ static struct i2c_algorithm smbus_algori static struct i2c_adapter sis630_adapter = { .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, @@ -252,8 +253,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .algo = &smbus_algorithm, }; ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis96x.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-sis96x.c 2005-09-26 14:48:02.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-sis96x.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-sis96x.c @@ -82,6 +82,7 @@ #define SIS96x_PROC_CALL 0x04 #define SIS96x_BLOCK_DATA 0x05 @@ -262,7 +263,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct i2c_adapter sis96x_adapter; static u16 sis96x_smbus_base; -@@ -257,7 +258,6 @@ +@@ -257,7 +258,6 @@ static struct i2c_adapter sis96x_adapter .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -270,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static struct pci_device_id sis96x_ids[] = { -@@ -294,7 +294,8 @@ +@@ -294,7 +294,8 @@ static int __devinit sis96x_probe(struct sis96x_smbus_base); /* Everything is happy, let's grab the memory and set things up. */ @@ -280,8 +281,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x " "already in use!\n", sis96x_smbus_base, sis96x_smbus_base + SMB_IOSIZE - 1); ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-via.c 2005-09-26 14:47:48.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-via.c 2005-09-26 14:48:02.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-via.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-via.c @@ -43,8 +43,8 @@ /* io-region reservation */ @@ -292,7 +293,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static u16 pm_io_base; /* -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ static int __devinit vt586b_probe(struct pci_read_config_word(dev, base, &pm_io_base); pm_io_base &= (0xff << 8); @@ -301,8 +302,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&dev->dev, "IO 0x%x-0x%x already in use\n", I2C_DIR, I2C_DIR + IOSPACE); return -ENODEV; } ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali1563.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-ali1563.c 2005-09-26 14:48:02.000000000 -0700 +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali1563.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-ali1563.c @@ -60,6 +60,7 @@ #define HST_CNTL2_SIZEMASK 0x38 @@ -311,7 +312,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static unsigned short ali1563_smba; static int ali1563_transaction(struct i2c_adapter * a, int size) -@@ -350,7 +351,8 @@ +@@ -350,7 +351,8 @@ static int __devinit ali1563_setup(struc dev_warn(&dev->dev,"ali1563_smba Uninitialized\n"); goto Err; } @@ -321,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_warn(&dev->dev,"Could not allocate I/O space"); goto Err; } -@@ -406,7 +408,7 @@ +@@ -406,7 +408,7 @@ static struct pci_device_id __devinitdat MODULE_DEVICE_TABLE (pci, ali1563_id_table); static struct pci_driver ali1563_pci_driver = { @@ -330,9 +331,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .id_table = ali1563_id_table, .probe = ali1563_probe, .remove = __devexit_p(ali1563_remove), ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd8111.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-amd8111.c 2005-09-26 14:48:02.000000000 -0700 -@@ -30,6 +30,8 @@ +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd8111.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-amd8111.c +@@ -30,6 +30,8 @@ struct amd_smbus { int size; }; @@ -341,7 +342,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * AMD PCI control registers definitions. */ -@@ -352,7 +354,7 @@ +@@ -352,7 +354,7 @@ static int __devinit amd8111_probe(struc smbus->base = pci_resource_start(dev, 0); smbus->size = pci_resource_len(dev, 0); diff --git a/i2c/hwmon-07.patch b/i2c/hwmon-07.patch index 3ca2cf3846b66e..85115da3251f00 100644 --- a/i2c/hwmon-07.patch +++ b/i2c/hwmon-07.patch @@ -16,8 +16,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/w83l785ts.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/w83l785ts.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/w83l785ts.c 2005-09-26 14:48:05.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/hwmon/w83l785ts.c ++++ gregkh-2.6/drivers/hwmon/w83l785ts.c @@ -37,6 +37,7 @@ #include <linux/jiffies.h> #include <linux/i2c.h> @@ -26,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <linux/err.h> /* How many retries on register read error */ -@@ -111,27 +112,24 @@ +@@ -111,27 +112,24 @@ struct w83l785ts_data { unsigned long last_updated; /* in jiffies */ /* registers values */ @@ -62,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Real code -@@ -228,7 +226,7 @@ +@@ -228,7 +226,7 @@ static int w83l785ts_detect(struct i2c_a init_MUTEX(&data->update_lock); /* Default values in case the first read fails (unlikely). */ @@ -71,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Tell the I2C layer a new client has arrived. */ if ((err = i2c_attach_client(new_client))) -@@ -246,8 +244,10 @@ +@@ -246,8 +244,10 @@ static int w83l785ts_detect(struct i2c_a goto exit_detach; } @@ -84,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; -@@ -305,10 +305,10 @@ +@@ -305,10 +305,10 @@ static struct w83l785ts_data *w83l785ts_ if (!data->valid || time_after(jiffies, data->last_updated + HZ * 2)) { dev_dbg(&client->dev, "Updating w83l785ts data.\n"); diff --git a/i2c/hwmon-08.patch b/i2c/hwmon-08.patch index 45ced249fc74fb..6ff3414a4f1ae5 100644 --- a/i2c/hwmon-08.patch +++ b/i2c/hwmon-08.patch @@ -16,9 +16,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/w83l785ts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/w83l785ts.c 2005-09-26 14:48:07.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/w83l785ts.c 2005-09-26 14:48:12.000000000 -0700 -@@ -74,7 +74,7 @@ +--- +--- gregkh-2.6.orig/drivers/hwmon/w83l785ts.c ++++ gregkh-2.6/drivers/hwmon/w83l785ts.c +@@ -74,7 +74,7 @@ I2C_CLIENT_INSMOD_1(w83l785ts); * The W83L785TS-S uses signed 8-bit values. */ @@ -27,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Functions declaration -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ struct w83l785ts_data { unsigned long last_updated; /* in jiffies */ /* registers values */ diff --git a/i2c/hwmon-09.patch b/i2c/hwmon-09.patch index ed59228bc8e843..76f37c7a0f799a 100644 --- a/i2c/hwmon-09.patch +++ b/i2c/hwmon-09.patch @@ -17,9 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/i2c-core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/i2c-core.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/i2c-core.c 2005-09-26 14:48:15.000000000 -0700 -@@ -706,10 +706,6 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/i2c-core.c ++++ gregkh-2.6/drivers/i2c/i2c-core.c +@@ -706,10 +706,6 @@ int i2c_probe(struct i2c_adapter *adapte int i, err; int adap_id = i2c_adapter_id(adapter); @@ -30,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Force entries are done first, and are not affected by ignore entries */ if (address_data->forces) { -@@ -736,6 +732,17 @@ +@@ -736,6 +732,17 @@ int i2c_probe(struct i2c_adapter *adapte } } diff --git a/i2c/hwmon-10.patch b/i2c/hwmon-10.patch index db33a437d6da7f..c967b5be09ed18 100644 --- a/i2c/hwmon-10.patch +++ b/i2c/hwmon-10.patch @@ -18,9 +18,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Documentation/i2c/functionality | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---- gregkh-2.6.orig/Documentation/i2c/functionality 2005-09-20 08:14:06.000000000 -0700 -+++ gregkh-2.6/Documentation/i2c/functionality 2005-09-26 14:48:18.000000000 -0700 -@@ -17,9 +17,10 @@ +--- +--- gregkh-2.6.orig/Documentation/i2c/functionality ++++ gregkh-2.6/Documentation/i2c/functionality +@@ -17,9 +17,10 @@ For the most up-to-date list of function I2C_FUNC_I2C Plain i2c-level commands (Pure SMBus adapters typically can not do these) I2C_FUNC_10BIT_ADDR Handles the 10-bit address extensions diff --git a/i2c/hwmon-11.patch b/i2c/hwmon-11.patch index 7df6b8bbfe31b2..48cae1a7df55b4 100644 --- a/i2c/hwmon-11.patch +++ b/i2c/hwmon-11.patch @@ -21,9 +21,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> include/linux/i2c.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---- gregkh-2.6.orig/include/linux/i2c.h 2005-09-26 14:26:26.000000000 -0700 -+++ gregkh-2.6/include/linux/i2c.h 2005-09-26 14:48:20.000000000 -0700 -@@ -454,8 +454,7 @@ +--- +--- gregkh-2.6.orig/include/linux/i2c.h ++++ gregkh-2.6/include/linux/i2c.h +@@ -454,8 +454,7 @@ struct i2c_msg { union i2c_smbus_data { __u8 byte; __u16 word; diff --git a/i2c/hwmon-12.patch b/i2c/hwmon-12.patch index 20402804c13473..1de0941104cdd7 100644 --- a/i2c/hwmon-12.patch +++ b/i2c/hwmon-12.patch @@ -16,9 +16,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-amd8111.c | 1 - 1 file changed, 1 deletion(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd8111.c 2005-09-26 14:48:04.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-amd8111.c 2005-09-26 14:48:22.000000000 -0700 -@@ -244,7 +244,6 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-amd8111.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-amd8111.c +@@ -244,7 +244,6 @@ static s32 amd8111_access(struct i2c_ada break; case I2C_SMBUS_BLOCK_PROC_CALL: diff --git a/i2c/hwmon-13.patch b/i2c/hwmon-13.patch index 587cdf419bb130..79fe92cec4943e 100644 --- a/i2c/hwmon-13.patch +++ b/i2c/hwmon-13.patch @@ -21,9 +21,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/i2c-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/i2c-core.c 2005-09-26 14:48:17.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/i2c-core.c 2005-09-26 14:48:28.000000000 -0700 -@@ -864,7 +864,7 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/i2c-core.c ++++ gregkh-2.6/drivers/i2c/i2c-core.c +@@ -864,7 +864,7 @@ static int i2c_smbus_add_pec(u16 addr, u break; case I2C_SMBUS_BYTE_DATA: buf[2] = data->byte; @@ -32,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (i2c_smbus_pec(3, buf, NULL) << 8); size = I2C_SMBUS_WORD_DATA; break; -@@ -1033,8 +1033,8 @@ +@@ -1033,8 +1033,8 @@ static s32 i2c_smbus_xfer_emulated(struc need to use only one message; when reading, we need two. We initialize most things with sane defaults, to keep the code below somewhat simpler. */ @@ -43,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int num = read_write == I2C_SMBUS_READ?2:1; struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 }, { addr, flags | I2C_M_RD, 0, msgbuf1 } -@@ -1097,7 +1097,7 @@ +@@ -1097,7 +1097,7 @@ static s32 i2c_smbus_xfer_emulated(struc } if(size == I2C_SMBUS_BLOCK_DATA_PEC) (msg[0].len)++; diff --git a/i2c/hwmon-adm9240-update-01.patch b/i2c/hwmon-adm9240-update-01.patch index 8e83e8887cb27b..0550f7da5e1e0b 100644 --- a/i2c/hwmon-adm9240-update-01.patch +++ b/i2c/hwmon-adm9240-update-01.patch @@ -19,8 +19,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/adm9240.c | 92 ++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/adm9240.c 2005-09-12 23:05:04.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/adm9240.c 2005-09-17 09:21:29.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/adm9240.c ++++ gregkh-2.6/drivers/hwmon/adm9240.c @@ -170,17 +170,6 @@ struct adm9240_data { u8 vrm; /* -- vrm set on startup, no accessor */ }; diff --git a/i2c/hwmon-adm9240-update-02.patch b/i2c/hwmon-adm9240-update-02.patch index 3f4d2b54c2a226..408a4af398ba45 100644 --- a/i2c/hwmon-adm9240-update-02.patch +++ b/i2c/hwmon-adm9240-update-02.patch @@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/adm9240.c | 340 +++++++++++++++++++++++------------------------- 1 file changed, 165 insertions(+), 175 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/adm9240.c 2005-09-17 09:21:29.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/adm9240.c 2005-09-17 09:21:30.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/adm9240.c ++++ gregkh-2.6/drivers/hwmon/adm9240.c @@ -45,6 +45,7 @@ #include <linux/module.h> #include <linux/slab.h> diff --git a/i2c/hwmon-via686a-save-memory.patch b/i2c/hwmon-via686a-save-memory.patch index 9e83414631b9e5..42a9a0e4fbe2cf 100644 --- a/i2c/hwmon-via686a-save-memory.patch +++ b/i2c/hwmon-via686a-save-memory.patch @@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/hwmon/via686a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- gregkh-2.6.orig/drivers/hwmon/via686a.c 2005-09-12 23:05:04.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/via686a.c 2005-09-17 09:21:32.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/via686a.c ++++ gregkh-2.6/drivers/hwmon/via686a.c @@ -198,7 +198,7 @@ static inline u8 FAN_TO_REG(long rpm, in but the function is very linear in the useful range (0-80 deg C), so we'll just use linear interpolation for 10-bit readings.) So, tempLUT diff --git a/i2c/i2c-device-id.patch b/i2c/i2c-device-id.patch index 0a81c52b1eaa5d..2dedbefb725360 100644 --- a/i2c/i2c-device-id.patch +++ b/i2c/i2c-device-id.patch @@ -15,8 +15,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> scripts/mod/file2alias.c | 10 ++++++++++ 4 files changed, 29 insertions(+) ---- gregkh-2.6.orig/drivers/hwmon/lm75.c 2005-09-30 16:19:51.000000000 -0700 -+++ gregkh-2.6/drivers/hwmon/lm75.c 2005-09-30 16:20:28.000000000 -0700 +--- gregkh-2.6.orig/drivers/hwmon/lm75.c ++++ gregkh-2.6/drivers/hwmon/lm75.c @@ -32,6 +32,19 @@ static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; @@ -37,8 +37,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Insmod parameters */ I2C_CLIENT_INSMOD_1(lm75); ---- gregkh-2.6.orig/include/linux/mod_devicetable.h 2005-09-30 16:19:51.000000000 -0700 -+++ gregkh-2.6/include/linux/mod_devicetable.h 2005-09-30 16:20:28.000000000 -0700 +--- gregkh-2.6.orig/include/linux/mod_devicetable.h ++++ gregkh-2.6/include/linux/mod_devicetable.h @@ -244,4 +244,9 @@ struct pcmcia_device_id { #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 @@ -49,8 +49,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +}; + #endif /* LINUX_MOD_DEVICETABLE_H */ ---- gregkh-2.6.orig/scripts/mod/file2alias.c 2005-09-30 16:19:51.000000000 -0700 -+++ gregkh-2.6/scripts/mod/file2alias.c 2005-09-30 16:20:28.000000000 -0700 +--- gregkh-2.6.orig/scripts/mod/file2alias.c ++++ gregkh-2.6/scripts/mod/file2alias.c @@ -359,6 +359,13 @@ static int do_vio_entry(const char *file return 1; } @@ -75,8 +75,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } ---- gregkh-2.6.orig/include/linux/i2c.h 2005-09-30 16:20:20.000000000 -0700 -+++ gregkh-2.6/include/linux/i2c.h 2005-09-30 16:20:28.000000000 -0700 +--- gregkh-2.6.orig/include/linux/i2c.h ++++ gregkh-2.6/include/linux/i2c.h @@ -31,6 +31,7 @@ #include <linux/module.h> #include <linux/types.h> diff --git a/i2c/i2c-viapro-01.patch b/i2c/i2c-viapro-01.patch index 08c1cdc462c716..089dfb1120a82a 100644 --- a/i2c/i2c-viapro-01.patch +++ b/i2c/i2c-viapro-01.patch @@ -15,8 +15,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 1 file changed, 6 insertions(+) --- ---- gregkh-2.6.orig/MAINTAINERS 2005-09-30 16:20:07.000000000 -0700 -+++ gregkh-2.6/MAINTAINERS 2005-09-30 16:20:21.000000000 -0700 +--- gregkh-2.6.orig/MAINTAINERS ++++ gregkh-2.6/MAINTAINERS @@ -2727,6 +2727,12 @@ P: Roger Luethi M: rl@hellgate.ch S: Maintained diff --git a/i2c/i2c-viapro-02.patch b/i2c/i2c-viapro-02.patch index 5bd00bf5d9835d..6711ab2142c036 100644 --- a/i2c/i2c-viapro-02.patch +++ b/i2c/i2c-viapro-02.patch @@ -17,8 +17,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 76 ++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 45 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-20 08:14:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:06.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c @@ -1,7 +1,7 @@ /* i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware @@ -41,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* SMBus address offsets */ static unsigned short vt596_smba; -@@ -68,26 +68,26 @@ +@@ -68,26 +68,26 @@ static unsigned short vt596_smba; /* PCI Address Constants */ /* SMBus data in configuration space can be found in two places, @@ -79,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* If force is set to anything different from 0, we forcibly enable the -@@ -115,19 +115,19 @@ +@@ -115,19 +115,19 @@ static int vt596_transaction(void) int timeout = 0; dev_dbg(&vt596_adapter.dev, "Transaction (pre): CNT=%02x, CMD=%02x, " @@ -104,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -1; } else { dev_dbg(&vt596_adapter.dev, "Successfull!\n"); -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ static int vt596_transaction(void) /* start the transaction by setting bit 6 */ outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT); @@ -113,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> I don't know if VIA needs this, Intel did */ do { msleep(1); -@@ -177,16 +177,16 @@ +@@ -177,16 +177,16 @@ static int vt596_transaction(void) dev_dbg(&vt596_adapter.dev, "Transaction (post): CNT=%02x, CMD=%02x, " "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT), @@ -134,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { int i, len; -@@ -256,7 +256,7 @@ +@@ -256,7 +256,7 @@ static s32 vt596_access(struct i2c_adapt case VT596_BYTE: /* Where is the result put? I assume here it is in * SMBHSTDAT0 but it might just as well be in the @@ -143,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ data->byte = inb_p(SMBHSTDAT0); break; -@@ -302,7 +302,7 @@ +@@ -302,7 +302,7 @@ static int __devinit vt596_probe(struct { unsigned char temp; int error = -ENODEV; @@ -152,7 +153,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Determine the address of the SMBus areas */ if (force_addr) { vt596_smba = force_addr & 0xfff0; -@@ -333,10 +333,10 @@ +@@ -333,10 +333,10 @@ static int __devinit vt596_probe(struct return -ENODEV; } @@ -165,7 +166,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENODEV; } -@@ -348,13 +348,13 @@ +@@ -348,13 +348,13 @@ static int __devinit vt596_probe(struct pci_write_config_word(pdev, id->driver_data, vt596_smba); pci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01); dev_warn(&pdev->dev, "WARNING: SMBus interface set to new " @@ -184,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * this. */ pci_write_config_byte(pdev, SMBHSTCFG, temp | 1); -@@ -381,8 +381,8 @@ +@@ -381,8 +381,8 @@ static int __devinit vt596_probe(struct vt596_adapter.dev.parent = &pdev->dev; snprintf(vt596_adapter.name, I2C_NAME_SIZE, @@ -195,7 +196,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> vt596_pdev = pci_dev_get(pdev); if (i2c_add_adapter(&vt596_adapter)) { pci_dev_put(vt596_pdev); -@@ -395,7 +395,7 @@ +@@ -395,7 +395,7 @@ static int __devinit vt596_probe(struct */ return -ENODEV; @@ -204,7 +205,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> release_region(vt596_smba, 8); return error; } -@@ -420,7 +420,7 @@ +@@ -420,7 +420,7 @@ static struct pci_device_id vt596_ids[] { 0, } }; @@ -213,9 +214,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct pci_driver vt596_driver = { .name = "vt596_smbus", ---- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro 2005-08-28 16:41:01.000000000 -0700 -+++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro 2005-09-28 15:54:06.000000000 -0700 -@@ -4,17 +4,17 @@ +--- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro ++++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro +@@ -4,17 +4,17 @@ Supported adapters: * VIA Technologies, Inc. VT82C596A/B Datasheet: Sometimes available at the VIA website @@ -238,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Module Parameters ----------------- -@@ -43,5 +43,3 @@ +@@ -43,5 +43,3 @@ Your lspci -n listing must show one of t If none of these show up, you should look in the BIOS for settings like enable ACPI / SMBus or even USB. diff --git a/i2c/i2c-viapro-03.patch b/i2c/i2c-viapro-03.patch index ddbe2f3c40f123..c93a470b80e785 100644 --- a/i2c/i2c-viapro-03.patch +++ b/i2c/i2c-viapro-03.patch @@ -20,8 +20,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 39 +++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:07.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:08.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c @@ -4,6 +4,7 @@ Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, @@ -30,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -@@ -88,6 +89,7 @@ +@@ -88,6 +89,7 @@ static unsigned short smb_cf_hstcfg = 0x #define VT596_BYTE_DATA 0x08 #define VT596_WORD_DATA 0x0C #define VT596_BLOCK_DATA 0x14 @@ -38,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* If force is set to anything different from 0, we forcibly enable the -@@ -107,6 +109,9 @@ +@@ -107,6 +109,9 @@ MODULE_PARM_DESC(force_addr, static struct i2c_adapter vt596_adapter; @@ -48,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Another internally used function */ static int vt596_transaction(void) { -@@ -225,6 +230,12 @@ +@@ -225,6 +230,12 @@ static s32 vt596_access(struct i2c_adapt } size = VT596_WORD_DATA; break; @@ -61,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> case I2C_SMBUS_BLOCK_DATA: outb_p(((addr & 0x7f) << 1) | (read_write & 0x01), SMBHSTADD); -@@ -240,11 +251,12 @@ +@@ -240,11 +251,12 @@ static s32 vt596_access(struct i2c_adapt for (i = 1; i <= len; i++) outb_p(data->block[i], SMBBLKDAT); } @@ -76,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (vt596_transaction()) /* Error in transaction */ return -1; -@@ -266,6 +278,7 @@ +@@ -266,6 +278,7 @@ static s32 vt596_access(struct i2c_adapt case VT596_WORD_DATA: data->word = inb_p(SMBHSTDAT0) + (inb_p(SMBHSTDAT1) << 8); break; @@ -84,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> case VT596_BLOCK_DATA: data->block[0] = inb_p(SMBHSTDAT0); if (data->block[0] > I2C_SMBUS_BLOCK_MAX) -@@ -280,9 +293,13 @@ +@@ -280,9 +293,13 @@ static s32 vt596_access(struct i2c_adapt static u32 vt596_func(struct i2c_adapter *adapter) { @@ -99,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static struct i2c_algorithm smbus_algorithm = { -@@ -379,6 +396,22 @@ +@@ -379,6 +396,22 @@ found: dev_dbg(&pdev->dev, "SMBREV = 0x%X\n", temp); dev_dbg(&pdev->dev, "VT596_smba = 0x%X\n", vt596_smba); @@ -122,9 +123,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> vt596_adapter.dev.parent = &pdev->dev; snprintf(vt596_adapter.name, I2C_NAME_SIZE, "SMBus Via Pro adapter at %04x", vt596_smba); ---- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro 2005-09-28 15:54:07.000000000 -0700 -+++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro 2005-09-28 15:54:08.000000000 -0700 -@@ -14,7 +14,8 @@ +--- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro ++++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro +@@ -14,7 +14,8 @@ Authors: Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, @@ -134,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Module Parameters ----------------- -@@ -43,3 +44,7 @@ +@@ -43,3 +44,7 @@ Your lspci -n listing must show one of t If none of these show up, you should look in the BIOS for settings like enable ACPI / SMBus or even USB. diff --git a/i2c/i2c-viapro-04.patch b/i2c/i2c-viapro-04.patch index e1f36fd8bf2a28..26e8f8a5379655 100644 --- a/i2c/i2c-viapro-04.patch +++ b/i2c/i2c-viapro-04.patch @@ -29,8 +29,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 122 +++++++++++++--------------------------- 1 file changed, 41 insertions(+), 81 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:09.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:11.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c @@ -39,7 +39,6 @@ #include <linux/pci.h> #include <linux/kernel.h> @@ -39,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <linux/ioport.h> #include <linux/i2c.h> #include <linux/init.h> -@@ -54,34 +53,22 @@ +@@ -54,34 +53,22 @@ static struct pci_dev *vt596_pdev; /* SMBus address offsets */ static unsigned short vt596_smba; #define SMBHSTSTS (vt596_smba + 0) @@ -75,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* VT82C596 constants */ #define VT596_QUICK 0x00 -@@ -107,12 +94,13 @@ +@@ -107,12 +94,13 @@ MODULE_PARM_DESC(force_addr, "EXTREMELY DANGEROUS!"); @@ -90,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int vt596_transaction(void) { int temp; -@@ -127,23 +115,21 @@ +@@ -127,23 +115,21 @@ static int vt596_transaction(void) /* Make sure the SMBus host is ready to start transmitting */ if ((temp = inb_p(SMBHSTSTS)) & 0x1F) { dev_dbg(&vt596_adapter.dev, "SMBus busy (0x%02x). " @@ -120,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> do { msleep(1); temp = inb_p(SMBHSTSTS); -@@ -152,33 +138,32 @@ +@@ -152,33 +138,32 @@ static int vt596_transaction(void) /* If the SMBus is still busy, we give up */ if (timeout >= MAX_TIMEOUT) { result = -1; @@ -165,7 +166,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_dbg(&vt596_adapter.dev, "Transaction (post): CNT=%02x, CMD=%02x, " "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT), -@@ -188,41 +173,29 @@ +@@ -188,41 +173,29 @@ static int vt596_transaction(void) return result; } @@ -209,7 +210,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> outb_p(command, SMBHSTCMD); if (read_write == I2C_SMBUS_WRITE) { outb_p(data->word & 0xff, SMBHSTDAT0); -@@ -232,31 +205,30 @@ +@@ -232,31 +205,30 @@ static s32 vt596_access(struct i2c_adapt break; case I2C_SMBUS_I2C_BLOCK_DATA: if (!(vt596_features & FEATURE_I2CBLOCK)) @@ -248,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (vt596_transaction()) /* Error in transaction */ return -1; -@@ -266,12 +238,6 @@ +@@ -266,12 +238,6 @@ static s32 vt596_access(struct i2c_adapt switch (size) { case VT596_BYTE: @@ -261,7 +262,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> case VT596_BYTE_DATA: data->byte = inb_p(SMBHSTDAT0); break; -@@ -283,12 +249,17 @@ +@@ -283,12 +249,17 @@ static s32 vt596_access(struct i2c_adapt data->block[0] = inb_p(SMBHSTDAT0); if (data->block[0] > I2C_SMBUS_BLOCK_MAX) data->block[0] = I2C_SMBUS_BLOCK_MAX; @@ -280,7 +281,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static u32 vt596_func(struct i2c_adapter *adapter) -@@ -311,7 +282,6 @@ +@@ -311,7 +282,6 @@ static struct i2c_adapter vt596_adapter .owner = THIS_MODULE, .class = I2C_CLASS_HWMON, .algo = &smbus_algorithm, @@ -288,7 +289,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static int __devinit vt596_probe(struct pci_dev *pdev, -@@ -328,12 +298,12 @@ +@@ -328,12 +298,12 @@ static int __devinit vt596_probe(struct } if ((pci_read_config_word(pdev, id->driver_data, &vt596_smba)) || @@ -304,7 +305,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } else { /* no matches at all */ dev_err(&pdev->dev, "Cannot configure " -@@ -351,7 +321,7 @@ +@@ -351,7 +321,7 @@ static int __devinit vt596_probe(struct } found: @@ -313,7 +314,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&pdev->dev, "SMBus region 0x%x already in use!\n", vt596_smba); return -ENODEV; -@@ -366,7 +336,7 @@ +@@ -366,7 +336,7 @@ found: pci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01); dev_warn(&pdev->dev, "WARNING: SMBus interface set to new " "address 0x%04x!\n", vt596_smba); @@ -322,7 +323,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (force) { /* NOTE: This assumes I/O space and other allocations * WERE done by the Bios! Don't complain if your -@@ -374,7 +344,7 @@ +@@ -374,7 +344,7 @@ found: * :') Check for Bios updates before resorting to * this. */ @@ -331,7 +332,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_info(&pdev->dev, "Enabling SMBus device\n"); } else { dev_err(&pdev->dev, "SMBUS: Error: Host SMBus " -@@ -384,16 +354,6 @@ +@@ -384,16 +354,6 @@ found: } } diff --git a/i2c/i2c-viapro-05.patch b/i2c/i2c-viapro-05.patch index d0f6a3af276a45..698c62c1a2bc48 100644 --- a/i2c/i2c-viapro-05.patch +++ b/i2c/i2c-viapro-05.patch @@ -16,8 +16,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:12.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:13.000000000 -0700 +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c @@ -22,15 +22,19 @@ */ @@ -47,9 +48,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Note: we assume there can only be one device, with one SMBus interface. */ ---- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro 2005-09-28 15:54:09.000000000 -0700 -+++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro 2005-09-28 15:54:13.000000000 -0700 -@@ -29,18 +29,18 @@ +--- gregkh-2.6.orig/Documentation/i2c/busses/i2c-viapro ++++ gregkh-2.6/Documentation/i2c/busses/i2c-viapro +@@ -29,18 +29,18 @@ Description ----------- i2c-viapro is a true SMBus host driver for motherboards with one of the diff --git a/i2c/i2c-viapro-06.patch b/i2c/i2c-viapro-06.patch index 4a59bf8ea31a25..980cb788c2520e 100644 --- a/i2c/i2c-viapro-06.patch +++ b/i2c/i2c-viapro-06.patch @@ -15,9 +15,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:14.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:15.000000000 -0700 -@@ -105,7 +105,7 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c +@@ -105,7 +105,7 @@ static struct i2c_adapter vt596_adapter; static unsigned int vt596_features; /* Return -1 on error, 0 on success */ @@ -26,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { int temp; int result = 0; -@@ -131,7 +131,7 @@ +@@ -131,7 +131,7 @@ static int vt596_transaction(void) } /* Start the transaction by setting bit 6 */ @@ -35,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* We will always wait for a fraction of a second */ do { -@@ -232,9 +232,8 @@ +@@ -232,9 +232,8 @@ static s32 vt596_access(struct i2c_adapt } outb_p(((addr & 0x7f) << 1) | read_write, SMBHSTADD); diff --git a/i2c/i2c-viapro-07.patch b/i2c/i2c-viapro-07.patch index 62ba095e8a2771..40dbcf08e956d1 100644 --- a/i2c/i2c-viapro-07.patch +++ b/i2c/i2c-viapro-07.patch @@ -17,9 +17,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:16.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:17.000000000 -0700 -@@ -104,6 +104,30 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c +@@ -104,6 +104,30 @@ static struct i2c_adapter vt596_adapter; #define FEATURE_I2CBLOCK (1<<0) static unsigned int vt596_features; @@ -50,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Return -1 on error, 0 on success */ static int vt596_transaction(u8 size) { -@@ -111,10 +135,9 @@ +@@ -111,10 +135,9 @@ static int vt596_transaction(u8 size) int result = 0; int timeout = 0; @@ -64,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Make sure the SMBus host is ready to start transmitting */ if ((temp = inb_p(SMBHSTSTS)) & 0x1F) { -@@ -169,10 +192,9 @@ +@@ -169,10 +192,9 @@ static int vt596_transaction(u8 size) if (temp & 0x1F) outb_p(temp, SMBHSTSTS); diff --git a/i2c/i2c-viapro-08.patch b/i2c/i2c-viapro-08.patch index 8d0d1606363d52..d9240ff6311fd0 100644 --- a/i2c/i2c-viapro-08.patch +++ b/i2c/i2c-viapro-08.patch @@ -14,9 +14,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/i2c/busses/i2c-viapro.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:54:19.000000000 -0700 -+++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c 2005-09-28 15:57:36.000000000 -0700 -@@ -126,6 +126,8 @@ +--- +--- gregkh-2.6.orig/drivers/i2c/busses/i2c-viapro.c ++++ gregkh-2.6/drivers/i2c/busses/i2c-viapro.c +@@ -126,6 +126,8 @@ static void vt596_dump_regs(const char * printk("%02x\n", inb_p(SMBBLKDAT)); } } @@ -25,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* Return -1 on error, 0 on success */ -@@ -135,9 +137,7 @@ +@@ -135,9 +137,7 @@ static int vt596_transaction(u8 size) int result = 0; int timeout = 0; @@ -35,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Make sure the SMBus host is ready to start transmitting */ if ((temp = inb_p(SMBHSTSTS)) & 0x1F) { -@@ -192,9 +192,7 @@ +@@ -192,9 +192,7 @@ static int vt596_transaction(u8 size) if (temp & 0x1F) outb_p(temp, SMBHSTSTS); |