41 files changed, 92 insertions, 304 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1094edf0da17..7559c1ca56ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3193,6 +3193,7 @@ F:	drivers/i2c/busses/i2c-stub.c
 I2C SUBSYSTEM
 M:      "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
 M:      "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
+M:      "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
@@ -4683,6 +4684,8 @@ Q:	http://patchwork.kernel.org/project/linux-omap/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:      Maintained
 F:      arch/arm/*omap*/
+F:      drivers/i2c/busses/i2c-omap.c
+F:      include/linux/i2c-omap.h
 
 OMAP CLOCK FRAMEWORK SUPPORT
 M:      Paul Walmsley <paul@pwsan.com>
@@ -5956,6 +5959,7 @@ L:	davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:      http://patchwork.kernel.org/project/linux-davinci/list/
 S:      Supported
 F:      arch/arm/mach-davinci
+F:      drivers/i2c/busses/i2c-davinci.c
 
 SIS 190 ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index b6807db7b36f..e66d248fc126 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -132,7 +132,8 @@
 #define ALI1535_SMBIO_EN        0x04    /* SMB I/O Space enable         */
 
 static struct pci_driver ali1535_driver;
-static unsigned short ali1535_smba;
+static unsigned long ali1535_smba;
+static unsigned short ali1535_offset;
 
 /* Detect whether a ALI1535 can be found, and initialize it, where necessary.
    Note the differences between kernels with the old PCI BIOS interface and
@@ -140,7 +141,7 @@ static unsigned short ali1535_smba;
    defined to make the transition easier. */
 static int __devinit ali1535_setup(struct pci_dev *dev)
 {
-        int retval = -ENODEV;
+        int retval;
         unsigned char temp;
 
         /* Check the following things:
@@ -149,15 +150,28 @@ static int __devinit ali1535_setup(struct pci_dev *dev)
                 - We can use the addresses
         */
 
+        retval = pci_enable_device(dev);
+        if (retval) {
+                dev_err(&dev->dev, "ALI1535_smb can't enable device\n");
+                goto exit;
+        }
+
         /* Determine the address of the SMBus area */
-        pci_read_config_word(dev, SMBBA, &ali1535_smba);
-        ali1535_smba &= (0xffff & ~(ALI1535_SMB_IOSIZE - 1));
-        if (ali1535_smba == 0) {
+        pci_read_config_word(dev, SMBBA, &ali1535_offset);
+        dev_dbg(&dev->dev, "ALI1535_smb is at offset 0x%04x\n", ali1535_offset);
+        ali1535_offset &= (0xffff & ~(ALI1535_SMB_IOSIZE - 1));
+        if (ali1535_offset == 0) {
                 dev_warn(&dev->dev,
                         "ALI1535_smb region uninitialized - upgrade BIOS?\n");
+                retval = -ENODEV;
                 goto exit;
         }
 
+        if (pci_resource_flags(dev, 0) & IORESOURCE_IO)
+                ali1535_smba = pci_resource_start(dev, 0) + ali1535_offset;
+        else
+                ali1535_smba = ali1535_offset;
+
         retval = acpi_check_region(ali1535_smba, ALI1535_SMB_IOSIZE,
                                    ali1535_driver.name);
         if (retval)
@@ -165,8 +179,9 @@ static int __devinit ali1535_setup(struct pci_dev *dev)
 
         if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE,
                             ali1535_driver.name)) {
-                dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n",
+                dev_err(&dev->dev, "ALI1535_smb region 0x%lx already in use!\n",
                         ali1535_smba);
+                retval = -EBUSY;
                 goto exit;
         }
 
@@ -174,6 +189,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)
         pci_read_config_byte(dev, SMBCFG, &temp);
         if ((temp & ALI1535_SMBIO_EN) == 0) {
                 dev_err(&dev->dev, "SMB device not enabled - upgrade BIOS?\n");
+                retval = -ENODEV;
                 goto exit_free;
         }
 
@@ -181,6 +197,7 @@ static int __devinit ali1535_setup(struct pci_dev *dev)
         pci_read_config_byte(dev, SMBHSTCFG, &temp);
         if ((temp & 1) == 0) {
                 dev_err(&dev->dev, "SMBus controller not enabled - upgrade BIOS?\n");
+                retval = -ENODEV;
                 goto exit_free;
         }
 
@@ -196,14 +213,13 @@ static int __devinit ali1535_setup(struct pci_dev *dev)