5 files changed, 33 insertions, 15 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b61f56b6f31..476b0bb72d6 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -177,6 +177,8 @@ config I2C_I801
             ESB2
             ICH8
             ICH9
+            Tolapai
+            ICH10
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index aa9157913b9..b0f771fe432 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -40,7 +40,9 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     ?       ?
+  Tolapai               0x5032     32     hard     yes     yes     yes
+  ICH10                 0x3a30     32     hard     yes     yes     yes
+  ICH10                 0x3a60     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no
@@ -588,6 +590,8 @@ static struct pci_device_id i801_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
         { 0, }
 };
 
@@ -608,10 +612,12 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
         case PCI_DEVICE_ID_INTEL_ESB2_17:
         case PCI_DEVICE_ID_INTEL_ICH8_5:
         case PCI_DEVICE_ID_INTEL_ICH9_6:
+        case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
+        case PCI_DEVICE_ID_INTEL_ICH10_4:
+        case PCI_DEVICE_ID_INTEL_ICH10_5:
                 i801_features |= FEATURE_I2C_BLOCK_READ;
                 /* fall through */
         case PCI_DEVICE_ID_INTEL_82801DB_3:
-        case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
                 i801_features |= FEATURE_SMBUS_PEC;
                 i801_features |= FEATURE_BLOCK_BUFFER;
                 break;
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 5161aaf9341..496ee875eb4 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -125,6 +125,13 @@ static int __devinit pca_isa_probe(struct device *dev, unsigned int id)
 
         dev_info(dev, "i/o base %#08lx. irq %d\n", base, irq);
 
+#ifdef CONFIG_PPC_MERGE
+        if (check_legacy_ioport(base)) {
+                dev_err(dev, "I/O address %#08lx is not available\n", base);
+                goto out;
+        }
+#endif
+
         if (!request_region(base, IO_SIZE, "i2c-pca-isa")) {
                 dev_err(dev, "I/O address %#08lx is in use\n", base);
                 goto out;
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index be99c02ecac..b03af5653c6 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -122,7 +122,7 @@ struct pmcmsptwi_data {
 };
 
 /* The default settings */
-const static struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
+static const struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
         .standard = {
                 .filter = 0x3,
                 .clock  = 0x1f,
@@ -133,7 +133,7 @@ const static struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
         },
 };
 
-const static struct pmcmsptwi_cfg pmcmsptwi_defcfg = {
+static const struct pmcmsptwi_cfg pmcmsptwi_defcfg = {
         .arbf           = 0x03,
         .nak            = 0x03,
         .add10          = 0x00,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2b557bfd7f7..2d2087ad708 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -999,7 +999,14 @@ static int i2c_pxa_probe(struct platform_device *dev)
         spin_lock_init(&i2c->lock);
         init_waitqueue_head(&i2c->wait);
 
-        sprintf(i2c->adap.name, "pxa_i2c-i2c.%u", dev->id);
+        /*
+         * If "dev->id" is negative we consider it as zero.
+         * The reason to do so is to avoid sysfs names that only make
+         * sense when there are multiple adapters.
+         */
+        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
+        snprintf(i2c->adap.name, sizeof(i2c->adap.name), "pxa_i2c-i2c.%u",
+                 i2c->adap.nr);
 
         i2c->clk = clk_get(&dev->dev, "I2CCLK");
         if (IS_ERR(i2c->clk)) {
@@ -1050,13 +1057,6 @@ static int i2c_pxa_probe(struct platform_device *dev)
         i2c->adap.algo_data = i2c;
         i2c->adap.dev.parent = &dev->dev;
 
-        /*
-         * If "dev->id" is negative we consider it as zero.
-         * The reason to do so is to avoid sysfs names that only make
-         * sense when there are multiple adapters.
-         */
-        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
-
         ret = i2c_add_numbered_adapter(&i2c->adap);
         if (ret < 0) {
                 printk(KERN_INFO "I2C: Failed to add bus\n");
@@ -1080,6 +1080,7 @@ eadapt:
 ereqirq:
         clk_disable(i2c->clk);
         i2c_pxa_disable(dev);
+        iounmap(i2c->reg_base);
 eremap:
         clk_put(i2c->clk);
 eclk:
@@ -1089,7 +1090,7 @@ emalloc:
         return ret;
 }
 
-static int i2c_pxa_remove(struct platform_device *dev)
+static int __exit i2c_pxa_remove(struct platform_device *dev)
 {
         struct pxa_i2c *i2c = platform_get_drvdata(dev);
 
@@ -1103,6 +1104,7 @@ static int i2c_pxa_remove(struct platform_device *dev)
         clk_put(i2c->clk);
         i2c_pxa_disable(dev);
 
+        iounmap(i2c->reg_base);
         release_mem_region(i2c->iobase, i2c->iosize);
         kfree(i2c);
 
@@ -1111,9 +1113,10 @@ static int i2c_pxa_remove(struct platform_device *dev)
 
 static struct platform_driver i2c_pxa_driver = {
         .probe          = i2c_pxa_probe,
-        .remove         = i2c_pxa_remove,
+        .remove         = __exit_p(i2c_pxa_remove),
         .driver         = {
                 .name   = "pxa2xx-i2c",
+                .owner  = THIS_MODULE,
         },
 };
 
@@ -1122,7 +1125,7 @@ static int __init i2c_adap_pxa_init(void)
         return platform_driver_register(&i2c_pxa_driver);
 }
 
-static void i2c_adap_pxa_exit(void)
+static void __exit i2c_adap_pxa_exit(void)
 {
         platform_driver_unregister(&i2c_pxa_driver);
 }