Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Convert some more new-style drivers to use module aliasing
  i2c: Match dummy devices by type
  i2c-sibyte: Mark i2c_sibyte_add_bus() as static
  i2c-sibyte: Correct a comment about frequency
  i2c: Improve the functionality documentation
  i2c: Improve smbus-protocol documentation
  i2c-piix4: Blacklist two mainboards
  i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
  i2c-mpc: Compare to NO_IRQ instead of zero

8 files changed, 86 insertions, 25 deletions

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 18beb0ad7bf3..a076129de7e8 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -99,7 +99,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing)
         u32 x;
         int result = 0;
 
-        if (i2c->irq == 0)
+        if (i2c->irq == NO_IRQ)
         {
                 while (!(readb(i2c->base + MPC_I2C_SR) & CSR_MIF)) {
                         schedule();
@@ -329,10 +329,9 @@ static int fsl_i2c_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         i2c->irq = platform_get_irq(pdev, 0);
-        if (i2c->irq < 0) {
-                result = -ENXIO;
-                goto fail_get_irq;
-        }
+        if (i2c->irq < 0)
+                i2c->irq = NO_IRQ; /* Use polling */
+
         i2c->flags = pdata->device_flags;
         init_waitqueue_head(&i2c->queue);
 
@@ -344,7 +343,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
                 goto fail_map;
         }
 
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 if ((result = request_irq(i2c->irq, mpc_i2c_isr,
                                           IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
                         printk(KERN_ERR
@@ -367,12 +366,11 @@ static int fsl_i2c_probe(struct platform_device *pdev)
         return result;
 
       fail_add:
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 free_irq(i2c->irq, i2c);
       fail_irq:
         iounmap(i2c->base);
       fail_map:
-      fail_get_irq:
         kfree(i2c);
         return result;
 };
@@ -384,7 +382,7 @@ static int fsl_i2c_remove(struct platform_device *pdev)
         i2c_del_adapter(&i2c->adap);
         platform_set_drvdata(pdev, NULL);
 
-        if (i2c->irq != 0)
+        if (i2c->irq != NO_IRQ)
                 free_irq(i2c->irq, i2c);
 
         iounmap(i2c->base);
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index fdc9ad805e35..ac9165968587 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -104,10 +104,31 @@ MODULE_PARM_DESC(force_addr,
 static int piix4_transaction(void);
 
 static unsigned short piix4_smba;
+static int srvrworks_csb5_delay;
 static struct pci_driver piix4_driver;
 static struct i2c_adapter piix4_adapter;
 
-static struct dmi_system_id __devinitdata piix4_dmi_table[] = {
+static struct dmi_system_id __devinitdata piix4_dmi_blacklist[] = {
+        {
+                .ident = "Sapphire AM2RD790",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "SAPPHIRE Inc."),
+                        DMI_MATCH(DMI_BOARD_NAME, "PC-AM2RD790"),
+                },
+        },
+        {
+                .ident = "DFI Lanparty UT 790FX",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "DFI Inc."),
+                        DMI_MATCH(DMI_BOARD_NAME, "LP UT 790FX"),
+                },
+        },
+        { }
+};
+
+/* The IBM entry is in a separate table because we only check it
+   on Intel-based systems */
+static struct dmi_system_id __devinitdata piix4_dmi_ibm[] = {
         {
                 .ident = "IBM",
                 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -122,8 +143,20 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
 
         dev_info(&PIIX4_dev->dev, "Found %s device\n", pci_name(PIIX4_dev));
 
+        if ((PIIX4_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) &&
+            (PIIX4_dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5))
+                srvrworks_csb5_delay = 1;
+
+        /* On some motherboards, it was reported that accessing the SMBus
+           caused severe hardware problems */
+        if (dmi_check_system(piix4_dmi_blacklist)) {
+                dev_err(&PIIX4_dev->dev,
+                        "Accessing the SMBus on this system is unsafe!\n");
+                return -EPERM;
+        }
+
         /* Don't access SMBus on IBM systems which get corrupted eeproms */
-        if (dmi_check_system(piix4_dmi_table) &&
+        if (dmi_check_system(piix4_dmi_ibm) &&
                         PIIX4_dev->vendor == PCI_VENDOR_ID_INTEL) {
                 dev_err(&PIIX4_dev->dev, "IBM system detected; this module "
                         "may corrupt your serial eeprom! Refusing to load "
@@ -230,10 +263,14 @@ static int piix4_transaction(void)
         outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT);
 
         /* We will always wait for a fraction of a second! (See PIIX4 docs errata) */
-        do {
+        if (srvrworks_csb5_delay) /* Extra delay for SERVERWORKS_CSB5 */
+                msleep(2);
+        else
+                msleep(1);
+
+        while ((timeout++ < MAX_TIMEOUT) &&
+               ((temp = inb_p(SMBHSTSTS)) & 0x01))
                 msleep(1);
-                temp = inb_p(SMBHSTSTS);
-        } while ((temp & 0x01) && (timeout++ < MAX_TIMEOUT));
 
         /* If the SMBus is still busy, we give up */
         if (timeout >= MAX_TIMEOUT) {
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 8fbbdb4c2f35..114634da6c6e 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -132,14 +132,14 @@ static const struct i2c_algorithm i2c_sibyte_algo = {
 /*
  * registering functions to load algorithms at runtime
  */
-int __init i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
+static int __init i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
 {
         struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
 
-        /* register new adapter to i2c module... */
+        /* Register new adapter to i2c module... */
         i2c_adap->algo = &i2c_sibyte_algo;
 
-        /* Set the frequency to 100 kHz */
+        /* Set the requested frequency. */
         csr_out32(speed, SMB_CSR(adap,R_SMB_FREQ));
         csr_out32(0, SMB_CSR(adap,R_SMB_CONTROL));
 
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 26384daccb96..c99ebeadb558 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -327,6 +327,11 @@ void i2c_unregister_device(struct i2c_client *client)
 EXPORT_SYMBOL_GPL(i2c_unregister_device);
 
 
+static const struct i2c_device_id dummy_id[] = {
+        { "dummy", 0 },
+        { },
+};
+
 static int dummy_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
@@ -342,13 +347,13 @@ static struct i2c_driver dummy_driver = {
         .driver.name    = "dummy",
         .probe          = dummy_probe,
         .remove         = dummy_remove,
+        .id_table       = dummy_id,
 };
 
 /**
  * i2c_new_dummy - return a new i2c device bound to a dummy driver
  * @adapter: the adapter managing the device
  * @address: seven bit address to be used
- * @type: optional label used for i2c_client.name
  * Context: can sleep
  *
  * This returns an I2C client bound to the "dummy" driver, intended for use
@@ -364,15 +369,12 @@ static struct i2c_driver dummy_driver = {
  * i2c_unregister_device(); or NULL to indicate an error.
  */
 struct i2c_client *
-i2c_new_dummy(struct i2c_adapter *adapter, u16 address, const char *type)
+i2c_new_dummy(struct i2c_adapter *adapter, u16 address)
 {
         struct i2c_board_info info = {
-                .driver_name    = "dummy",
-                .addr           = address,
+                I2C_BOARD_INFO("dummy", address),
         };
 
-        if (type)
-                strlcpy(info.type, type, sizeof info.type);
         return i2c_new_device(adapter, &info);
 }
 EXPORT_SYMBOL_GPL(i2c_new_dummy);
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index e57a64605778..8f0100f67a91 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -885,12 +885,19 @@ static int __exit tcm825x_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct i2c_device_id tcm825x_id[] = {
+        { "tcm825x", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tcm825x_id);
+
 static struct i2c_driver tcm825x_i2c_driver = {
         .driver = {
                 .name = TCM825X_NAME,
         },
         .probe  = tcm825x_probe,
         .remove = __exit_p(tcm825x_remove),
+        .id_table = tcm825x_id,
 };
 
 static struct tcm825x_sensor tcm825x = {
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c
index f1db54202dea..28ab9f9d760a 100644
--- a/drivers/media/video/tlv320aic23b.c
+++ b/drivers/media/video/tlv320aic23b.c
@@ -168,6 +168,11 @@ static int tlv320aic23b_remove(struct i2c_client *client)
 
 /* ----------------------------------------------------------------------- */
 
+static const struct i2c_device_id tlv320aic23b_id[] = {
+        { "tlv320aic23b", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tlv320aic23b",
@@ -175,4 +180,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .command = tlv320aic23b_command,
         .probe = tlv320aic23b_probe,
         .remove = tlv320aic23b_remove,
+        .id_table = tlv320aic23b_id,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 6f9945b04e1f..c77914d99d15 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1505,7 +1505,8 @@ static int chip_probe(struct i2c_client *client, const struct i2c_device_id *id)
         }
 
         /* fill required data structures */
-        strcpy(client->name, desc->name);
+        if (!id)
+                strlcpy(client->name, desc->name, I2C_NAME_SIZE);
         chip->type = desc-chiplist;
         chip->shadow.count = desc->registers+1;
         chip->prevmode = -1;
@@ -1830,6 +1831,15 @@ static int chip_legacy_probe(struct i2c_adapter *adap)
         return 0;
 }
 
+/* This driver supports many devices and the idea is to let the driver
+   detect which device is present. So rather than listing all supported
+   devices here, we pretend to support a single, fake device type. */
+static const struct i2c_device_id chip_id[] = {
+        { "tvaudio", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, chip_id);
+
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "tvaudio",
         .driverid = I2C_DRIVERID_TVAUDIO,
@@ -1837,6 +1847,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .probe = chip_probe,
         .remove = chip_remove,
         .legacy_probe = chip_legacy_probe,
+        .id_table = chip_id,
 };
 
 /*
diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
index 29f47bacfc77..a6fa1f2f2ca6 100644
--- a/drivers/rtc/rtc-s35390a.c
+++ b/drivers/rtc/rtc-s35390a.c
@@ -227,7 +227,7 @@ static int s35390a_probe(struct i2c_client *client,
         /* This chip uses multiple addresses, use dummy devices for them */
         for (i = 1; i < 8; ++i) {
                 s35390a->client[i] = i2c_new_dummy(client->adapter,
-                                        client->addr + i, "rtc-s35390a");
+                                        client->addr + i);
                 if (!s35390a->client[i]) {
                         dev_err(&client->dev, "Address %02x unavailable\n",
                                                 client->addr + i);