6 files changed, 208 insertions, 16 deletions

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 0ab7e37f5b00..1ab41313ce51 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -137,7 +137,7 @@ static int i801_setup(struct pci_dev *dev)
                 pci_read_config_word(I801_dev, SMBBA, &i801_smba);
                 i801_smba &= 0xfff0;
                 if(i801_smba == 0) {
-                        dev_err(&dev->dev, "SMB base address uninitialized"
+                        dev_err(&dev->dev, "SMB base address uninitialized "
                                 "- upgrade BIOS or use force_addr=0xaddr\n");
                         return -ENODEV;
                 }
@@ -186,7 +186,7 @@ static int i801_transaction(void)
         int result = 0;
         int timeout = 0;
 
-        dev_dbg(&I801_dev->dev, "Transaction (pre): CNT=%02x, CMD=%02x,"
+        dev_dbg(&I801_dev->dev, "Transaction (pre): CNT=%02x, CMD=%02x, "
                 "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT),
                 inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
                 inb_p(SMBHSTDAT1));
@@ -240,7 +240,7 @@ static int i801_transaction(void)
                 outb_p(inb(SMBHSTSTS), SMBHSTSTS);
 
         if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
-                dev_dbg(&I801_dev->dev, "Failed reset at end of transaction"
+                dev_dbg(&I801_dev->dev, "Failed reset at end of transaction "
                         "(%02x)\n", temp);
         }
         dev_dbg(&I801_dev->dev, "Transaction (post): CNT=%02x, CMD=%02x, "
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 03c23ce98edb..04adde62a003 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -288,6 +288,194 @@ static struct i2c_adapter mpc_ops = {
         .retries = 1
 };
 
+static int fsl_i2c_probe(struct device *device)
+{
+        int result = 0;
+        struct mpc_i2c *i2c;
+        struct platform_device *pdev = to_platform_device(device);
+        struct fsl_i2c_platform_data *pdata;
+        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
+
+        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
+                return -ENOMEM;
+        }
+        memset(i2c, 0, sizeof(*i2c));
+
+        i2c->irq = platform_get_irq(pdev, 0);
+        i2c->flags = pdata->device_flags;
+        init_waitqueue_head(&i2c->queue);
+
+        i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);
+
+        if (!i2c->base) {
+                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
+                result = -ENOMEM;
+                goto fail_map;
+        }
+
+        if (i2c->irq != 0)
+                if ((result = request_irq(i2c->irq, mpc_i2c_isr,
+                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
+                        printk(KERN_ERR
+                               "i2c-mpc - failed to attach interrupt\n");
+                        goto fail_irq;
+                }
+
+        mpc_i2c_setclock(i2c);
+        dev_set_drvdata(device, i2c);
+
+        i2c->adap = mpc_ops;
+        i2c_set_adapdata(&i2c->adap, i2c);
+        i2c->adap.dev.parent = &pdev->dev;
+        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
+                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
+                goto fail_add;
+        }
+
+        return result;
+
+      fail_add:
+        if (i2c->irq != 0)
+                free_irq(i2c->irq, NULL);
+      fail_irq:
+        iounmap(i2c->base);
+      fail_map:
+        kfree(i2c);
+        return result;
+};
+
+static int fsl_i2c_remove(struct device *device)
+{
+        struct mpc_i2c *i2c = dev_get_drvdata(device);
+
+        i2c_del_adapter(&i2c->adap);
+        dev_set_drvdata(device, NULL);
+
+        if (i2c->irq != 0)
+                free_irq(i2c->irq, i2c);
+
+        iounmap(i2c->base);
+        kfree(i2c);
+        return 0;
+};
+
+/* Structure for a device driver */
+static struct device_driver fsl_i2c_driver = {
+        .name = "fsl-i2c",
+        .bus = &platform_bus_type,
+        .probe = fsl_i2c_probe,
+        .remove = fsl_i2c_remove,
+};
+
+static int __init fsl_i2c_init(void)
+{
+        return driver_register(&fsl_i2c_driver);
+}
+
+static void __exit fsl_i2c_exit(void)
+{
+        driver_unregister(&fsl_i2c_driver);
+}
+
+module_init(fsl_i2c_init);
+module_exit(fsl_i2c_exit);
+
+static int fsl_i2c_probe(struct device *device)
+{
+        int result = 0;
+        struct mpc_i2c *i2c;
+        struct platform_device *pdev = to_platform_device(device);
+        struct fsl_i2c_platform_data *pdata;
+        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
+
+        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
+                return -ENOMEM;
+        }
+        memset(i2c, 0, sizeof(*i2c));
+
+        i2c->irq = platform_get_irq(pdev, 0);
+        i2c->flags = pdata->device_flags;
+        init_waitqueue_head(&i2c->queue);
+
+        i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);
+
+        if (!i2c->base) {
+                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
+                result = -ENOMEM;
+                goto fail_map;
+        }
+
+        if (i2c->irq != 0)
+                if ((result = request_irq(i2c->irq, mpc_i2c_isr,
+                                          SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
+                        printk(KERN_ERR
+                               "i2c-mpc - failed to attach interrupt\n");
+                        goto fail_irq;
+                }
+
+        mpc_i2c_setclock(i2c);
+        dev_set_drvdata(device, i2c);
+
+        i2c->adap = mpc_ops;
+        i2c_set_adapdata(&i2c->adap, i2c);
+        i2c->adap.dev.parent = &pdev->dev;
+        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
+                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
+                goto fail_add;
+        }
+
+        return result;
+
+      fail_add:
+        if (i2c->irq != 0)
+                free_irq(i2c->irq, NULL);
+      fail_irq:
+        iounmap(i2c->base);
+      fail_map:
+        kfree(i2c);
+        return result;
+};
+
+static int fsl_i2c_remove(struct device *device)
+{
+        struct mpc_i2c *i2c = dev_get_drvdata(device);
+
+        i2c_del_adapter(&i2c->adap);
+        dev_set_drvdata(device, NULL);
+
+        if (i2c->irq != 0)
+                free_irq(i2c->irq, i2c);
+
+        iounmap(i2c->base);
+        kfree(i2c);
+        return 0;
+};
+
+/* Structure for a device driver */
+static struct device_driver fsl_i2c_driver = {
+        .name = "fsl-i2c",
+        .bus = &platform_bus_type,
+        .probe = fsl_i2c_probe,
+        .remove = fsl_i2c_remove,
+};
+
+static int __init fsl_i2c_init(void)
+{
+        return driver_register(&fsl_i2c_driver);
+}
+
+static void __exit fsl_i2c_exit(void)
+{
+        driver_unregister(&fsl_i2c_driver);
+}
+
+module_init(fsl_i2c_init);
+module_exit(fsl_i2c_exit);
+
 MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");
 MODULE_DESCRIPTION
     ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 74ece8ac1c23..82cf959989fd 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -165,7 +165,7 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
         buf[0] = 0;             /* reg offset */
         buf[1] = BIN2BCD(dt->tm_sec);
         buf[2] = BIN2BCD(dt->tm_min);
-        buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);
+        buf[3] = BIN2BCD(dt->tm_hour);
         buf[4] = BIN2BCD(dt->tm_wday) + 1;
         buf[5] = BIN2BCD(dt->tm_mday);
         buf[6] = BIN2BCD(dt->tm_mon) + 1;
@@ -344,9 +344,9 @@ static void ds1337_init_client(struct i2c_client *client)
 
         /* Ensure that device is set in 24-hour mode */
         val = i2c_smbus_read_byte_data(client, DS1337_REG_HOUR);
-        if ((val >= 0) && (val & (1 << 6)) == 0)
+        if ((val >= 0) && (val & (1 << 6)))
                 i2c_smbus_write_byte_data(client, DS1337_REG_HOUR,
-                                          val | (1 << 6));
+                                          val & 0x3f);
 }
 
 static int ds1337_detach_client(struct i2c_client *client)
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 6ea413f6d5e5..a2da31b0dd7b 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -163,6 +163,11 @@ int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
         struct eeprom_data *data;
         int err = 0;
 
+        /* prevent 24RF08 corruption */
+        if (kind < 0)
+                i2c_smbus_xfer(adapter, address, 0, 0, 0,
+                               I2C_SMBUS_QUICK, NULL);
+
         /* There are three ways we can read the EEPROM data:
            (1) I2C block reads (faster, but unsupported by most adapters)
            (2) Consecutive byte reads (100% overhead)
@@ -187,9 +192,6 @@ int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client->driver = &eeprom_driver;
         new_client->flags = 0;
 
-        /* prevent 24RF08 corruption */
-        i2c_smbus_write_quick(new_client, 0);
-
         /* Fill in the remaining client fields */
         strlcpy(new_client->name, "eeprom", I2C_NAME_SIZE);
         data->valid = 0;
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index c4f14d9623c4..0230375f72e5 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -343,6 +343,11 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
         struct max6875_data *data;
         int err = 0;
 
+        /* Prevent 24RF08 corruption (in case of user error) */
+        if (kind < 0)
+                i2c_smbus_xfer(adapter, address, 0, 0, 0,
+                               I2C_SMBUS_QUICK, NULL);
+
         /* There are three ways we can read the EEPROM data:
            (1) I2C block reads (faster, but unsupported by most adapters)
            (2) Consecutive byte reads (100% overhead)
@@ -370,9 +375,6 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client->driver = &max6875_driver;
         new_client->flags = 0;
 
-        /* Prevent 24RF08 corruption */
-        i2c_smbus_write_quick(new_client, 0);
-
         /* Setup the user section */
         data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
         data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4fd4f52c8e9b..4a9ead277596 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -231,8 +231,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                 if (driver->detach_adapter)
                         if ((res = driver->detach_adapter(adap))) {
                                 dev_warn(&adap->dev, "can't detach adapter "
-                                         "while detaching driver %s: driver not "
-                                         "detached!", driver->name);
+                                         "while detaching driver %s: driver "
+                                         "not detached!\n", driver->name);
                                 goto out_unlock;
                         }
         }
@@ -456,8 +456,8 @@ int i2c_detach_client(struct i2c_client *client)
                 res = adapter->client_unregister(client);
                 if (res) {
                         dev_err(&client->dev,
-                               "client_unregister [%s] failed, "
-                               "client not detached", client->name);
+                                "client_unregister [%s] failed, "
+                                "client not detached\n", client->name);
                         goto out;
                 }
         }