20 files changed, 210 insertions, 69 deletions

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 96867347bcbf..711ca08ab776 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -38,6 +38,20 @@ config I2C_CHARDEV
           This support is also available as a module.  If so, the module 
           will be called i2c-dev.
 
+config I2C_HELPER_AUTO
+        bool "Autoselect pertinent helper modules"
+        default y
+        help
+          Some I2C bus drivers require so-called "I2C algorithm" modules
+          to work. These are basically software-only abstractions of generic
+          I2C interfaces. This option will autoselect them so that you don't
+          have to care.
+
+          Unselect this only if you need to enable additional helper
+          modules, for example for use with external I2C bus drivers.
+
+          In doubt, say Y.
+
 source drivers/i2c/algos/Kconfig
 source drivers/i2c/busses/Kconfig
 source drivers/i2c/chips/Kconfig
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index 7137a17402fe..b788579b8227 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -2,15 +2,20 @@
 # I2C algorithm drivers configuration
 #
 
+menu "I2C Algorithms"
+        depends on !I2C_HELPER_AUTO
+
 config I2C_ALGOBIT
-        tristate
+        tristate "I2C bit-banging interfaces"
 
 config I2C_ALGOPCF
-        tristate
+        tristate "I2C PCF 8584 interfaces"
 
 config I2C_ALGOPCA
-        tristate
+        tristate "I2C PCA 9564 interfaces"
 
 config I2C_ALGO_SGI
         tristate
         depends on SGI_IP22 || SGI_IP32 || X86_VISWS
+
+endmenu
diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c
index 7c2be3558a24..75089febbc13 100644
--- a/drivers/i2c/busses/i2c-acorn.c
+++ b/drivers/i2c/busses/i2c-acorn.c
@@ -16,7 +16,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/hardware/ioc.h>
 #include <asm/system.h>
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index 72872d1e63ef..8ba2bcf727d3 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -155,6 +155,9 @@ static int __init amd756_s4882_init(void)
         int i, error;
         union i2c_smbus_data ioconfig;
 
+        if (!amd756_smbus.dev.parent)
+                return -ENODEV;
+
         /* Configure the PCA9556 multiplexer */
         ioconfig.byte = 0x00; /* All I/O to output mode */
         error = i2c_smbus_xfer(&amd756_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,
@@ -168,11 +171,7 @@ static int __init amd756_s4882_init(void)
         /* Unregister physical bus */
         error = i2c_del_adapter(&amd756_smbus);
         if (error) {
-                if (error == -EINVAL)
-                        error = -ENODEV;
-                else
-                        dev_err(&amd756_smbus.dev, "Physical bus removal "
-                                "failed\n");
+                dev_err(&amd756_smbus.dev, "Physical bus removal failed\n");
                 goto ERROR0;
         }
 
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 73d61946a534..c1adcdbf7979 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -27,9 +27,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/at91_twi.h>
-#include <asm/arch/board.h>
-#include <asm/arch/cpu.h>
+#include <mach/at91_twi.h>
+#include <mach/board.h>
+#include <mach/cpu.h>
 
 #define TWI_CLOCK               100000          /* Hz. max 400 Kbits/sec */
 
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 48d084bdf7c8..3c855ff2992f 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -49,6 +49,8 @@ struct bfin_twi_iface {
         struct i2c_msg          *pmsg;
         int                     msg_num;
         int                     cur_msg;
+        u16                     saved_clkdiv;
+        u16                     saved_control;
         void __iomem            *regs_base;
 };
 
@@ -565,32 +567,43 @@ static u32 bfin_twi_functionality(struct i2c_adapter *adap)
                I2C_FUNC_I2C;
 }
 
-
 static struct i2c_algorithm bfin_twi_algorithm = {
         .master_xfer   = bfin_twi_master_xfer,
         .smbus_xfer    = bfin_twi_smbus_xfer,
         .functionality = bfin_twi_functionality,
 };
 
-
-static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state)
+static int i2c_bfin_twi_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        struct bfin_twi_iface *iface = platform_get_drvdata(dev);
+        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
+
+        iface->saved_clkdiv = read_CLKDIV(iface);
+        iface->saved_control = read_CONTROL(iface);
+
+        free_irq(iface->irq, iface);
 
         /* Disable TWI */
-        write_CONTROL(iface, read_CONTROL(iface) & ~TWI_ENA);
-        SSYNC();
+        write_CONTROL(iface, iface->saved_control & ~TWI_ENA);
 
         return 0;
 }
 
-static int i2c_bfin_twi_resume(struct platform_device *dev)
+static int i2c_bfin_twi_resume(struct platform_device *pdev)
 {
-        struct bfin_twi_iface *iface = platform_get_drvdata(dev);
+        struct bfin_twi_iface *iface = platform_get_drvdata(pdev);
 
-        /* Enable TWI */
-        write_CONTROL(iface, read_CONTROL(iface) | TWI_ENA);
-        SSYNC();
+        int rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+                IRQF_DISABLED, pdev->name, iface);
+        if (rc) {
+                dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
+                return -ENODEV;
+        }
+
+        /* Resume TWI interface clock as specified */
+        write_CLKDIV(iface, iface->saved_clkdiv);
+
+        /* Resume TWI */
+        write_CONTROL(iface, iface->saved_control);
 
         return 0;
 }
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index af3846eda985..5d7789834b95 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -36,10 +36,9 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
 
-#include <asm/arch/i2c.h>
+#include <mach/i2c.h>
 
 /* ----- global defines ----------------------------------------------- */
 
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 79b455a1f090..32104eac8d3d 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -77,7 +77,7 @@ static int i2c_gpio_getscl(void *data)
         return gpio_get_value(pdata->scl_pin);
 }
 
-static int __init i2c_gpio_probe(struct platform_device *pdev)
+static int __devinit i2c_gpio_probe(struct platform_device *pdev)
 {
         struct i2c_gpio_platform_data *pdata;
         struct i2c_algo_bit_data *bit_data;
@@ -174,7 +174,7 @@ err_alloc_adap:
         return ret;
 }
 
-static int __exit i2c_gpio_remove(struct platform_device *pdev)
+static int __devexit i2c_gpio_remove(struct platform_device *pdev)
 {
         struct i2c_gpio_platform_data *pdata;
         struct i2c_adapter *adap;
@@ -196,14 +196,15 @@ static struct platform_driver i2c_gpio_driver = {
                 .name   = "i2c-gpio",
                 .owner  = THIS_MODULE,
         },
-        .remove         = __exit_p(i2c_gpio_remove),
+        .probe          = i2c_gpio_probe,
+        .remove         = __devexit_p(i2c_gpio_remove),
 };
 
 static int __init i2c_gpio_init(void)
 {
         int ret;
 
-        ret = platform_driver_probe(&i2c_gpio_driver, i2c_gpio_probe);
+        ret = platform_driver_register(&i2c_gpio_driver);
         if (ret)
                 printk(KERN_ERR "i2c-gpio: probe failed: %d\n", ret);
 
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 5af9e6521e6c..05d72e981353 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -33,8 +33,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/hardware.h>       /* Pick up IXP2000-specific bits */
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>      /* Pick up IXP2000-specific bits */
+#include <mach/gpio.h>
 
 static inline int ixp2000_scl_pin(void *data)
 {
diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
index d1a4cbcf2aa4..29015eb9ca46 100644
--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
@@ -150,6 +150,9 @@ static int __init nforce2_s4985_init(void)
         int i, error;
         union i2c_smbus_data ioconfig;
 
+        if (!nforce2_smbus)
+                return -ENODEV;
+
         /* Configure the PCA9556 multiplexer */
         ioconfig.byte = 0x00; /* All I/O to output mode */
         error = i2c_smbus_xfer(nforce2_smbus, 0x18, 0, I2C_SMBUS_WRITE, 0x03,
@@ -161,8 +164,6 @@ static int __init nforce2_s4985_init(void)
         }
 
         /* Unregister physical bus */
-        if (!nforce2_smbus)
-                return -ENODEV;
         error = i2c_del_adapter(nforce2_smbus);
         if (error) {
                 dev_err(&nforce2_smbus->dev, "Physical bus removal failed\n");
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 1ca21084ffcf..ec15cff556b9 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -19,7 +19,7 @@
 #include <linux/completion.h>
 #include <linux/platform_device.h>
 #include <linux/i2c-pnx.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index af9e6034d7fb..44d838410f15 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -34,11 +34,11 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/i2c.h>
+#include <mach/pxa-regs.h>
 
 struct pxa_i2c {
         spinlock_t              lock;
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 007390ad9810..c772e02c2803 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -33,12 +33,13 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-iic.h>
 #include <asm/plat-s3c/iic.h>
 
@@ -64,6 +65,7 @@ struct s3c24xx_i2c {
         unsigned int            tx_setup;
 
         enum s3c24xx_i2c_state  state;
+        unsigned long           clkrate;
 
         void __iomem            *regs;
         struct clk              *clk;
@@ -71,6 +73,10 @@ struct s3c24xx_i2c {
         struct resource         *irq;
         struct resource         *ioarea;
         struct i2c_adapter      adap;
+
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
 };
 
 /* default platform data to use if not supplied in the platform_device
@@ -501,6 +507,9 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
         unsigned long timeout;
         int ret;
 
+        if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+                return -EIO;
+
         ret = s3c24xx_i2c_set_master(i2c);
         if (ret != 0) {
                 dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
@@ -636,27 +645,28 @@ static inline int freq_acceptable(unsigned int freq, unsigned int wanted)
         return (diff >= -2 && diff <= 2);
 }
 
-/* s3c24xx_i2c_getdivisor
+/* s3c24xx_i2c_clockrate
  *
  * work out a divisor for the user requested frequency setting,
  * either by the requested frequency, or scanning the acceptable
  * range of frequencies until something is found
 */
 
-static int s3c24xx_i2c_getdivisor(struct s3c24xx_i2c *i2c,
-                                  struct s3c2410_platform_i2c *pdata,
-                                  unsigned long *iicon,
-                                  unsigned int *got)
+static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c *i2c, unsigned int *got)
 {
+        struct s3c2410_platform_i2c *pdata;
         unsigned long clkin = clk_get_rate(i2c->clk);
-        
         unsigned int divs, div1;
+        u32 iiccon;
         int freq;
         int start, end;
 
+        i2c->clkrate = clkin;
+
+        pdata = s3c24xx_i2c_get_platformdata(i2c->adap.dev.parent);
         clkin /= 1000;          /* clkin now in KHz */
      
-        dev_dbg(i2c->dev,  "pdata %p, freq %lu %lu..%lu\n",
+        dev_dbg(i2c->dev, "pdata %p, freq %lu %lu..%lu\n",
                  pdata, pdata->bus_freq, pdata->min_freq, pdata->max_freq);
 
         if (pdata->bus_freq != 0) {
@@ -688,11 +698,79 @@ static int s3c24xx_i2c_getdivisor(struct s3c24xx_i2c *i2c,
 
  found:
         *got = freq;
-        *iicon |= (divs-1);
-        *iicon |= (div1 == 512) ? S3C2410_IICCON_TXDIV_512 : 0;
+
+        iiccon = readl(i2c->regs + S3C2410_IICCON);
+        iiccon &= ~(S3C2410_IICCON_SCALEMASK | S3C2410_IICCON_TXDIV_512);
+        iiccon |= (divs-1);
+
+        if (div1 == 512)
+                iiccon |= S3C2410_IICCON_TXDIV_512;
+
+        writel(iiccon, i2c->regs + S3C2410_IICCON);
+
+        return 0;
+}
+
+#ifdef CONFIG_CPU_FREQ
+
+#define freq_to_i2c(_n) container_of(_n, struct s3c24xx_i2c, freq_transition)
+
+static int s3c24xx_i2c_cpufreq_transition(struct notifier_block *nb,
+                                          unsigned long val, void *data)
+{
+        struct s3c24xx_i2c *i2c = freq_to_i2c(nb);
+        unsigned long flags;
+        unsigned int got;
+        int delta_f;
+        int ret;
+
+        delta_f = clk_get_rate(i2c->clk) - i2c->clkrate;
+
+        /* if we're post-change and the input clock has slowed down
+         * or at pre-change and the clock is about to speed up, then
+         * adjust our clock rate. <0 is slow, >0 speedup.
+         */
+
+        if ((val == CPUFREQ_POSTCHANGE && delta_f < 0) ||
+            (val == CPUFREQ_PRECHANGE && delta_f > 0)) {
+                spin_lock_irqsave(&i2c->lock, flags);
+                ret = s3c24xx_i2c_clockrate(i2c, &got);
+                spin_unlock_irqrestore(&i2c->lock, flags);
+
+                if (ret < 0)
+                        dev_err(i2c->dev, "cannot find frequency\n");
+                else
+                        dev_info(i2c->dev, "setting freq %d\n", got);
+        }
+
+        return 0;
+}
+
+static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c)
+{
+        i2c->freq_transition.notifier_call = s3c24xx_i2c_cpufreq_transition;
+
+        return cpufreq_register_notifier(&i2c->freq_transition,
+                                         CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
+{
+        cpufreq_unregister_notifier(&i2c->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+#else
+static inline int s3c24xx_i2c_register_cpufreq(struct s3c24xx_i2c *i2c)
+{
         return 0;
 }
 
+static inline void s3c24xx_i2c_deregister_cpufreq(struct s3c24xx_i2c *i2c)
+{
+}
+#endif
+
 /* s3c24xx_i2c_init
  *
  * initialise the controller, set the IO lines and frequency 
@@ -719,9 +797,12 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         dev_info(i2c->dev, "slave address 0x%02x\n", pdata->slave_addr);
 
+        writel(iicon, i2c->regs + S3C2410_IICCON);
+
         /* we need to work out the divisors for the clock... */
 
-        if (s3c24xx_i2c_getdivisor(i2c, pdata, &iicon, &freq) != 0) {
+        if (s3c24xx_i2c_clockrate(i2c, &freq) != 0) {
+                writel(0, i2c->regs + S3C2410_IICCON);
                 dev_err(i2c->dev, "cannot meet bus frequency required\n");
                 return -EINVAL;
         }
@@ -730,8 +811,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
         dev_info(i2c->dev, "bus frequency set to %d KHz\n", freq);
         dev_dbg(i2c->dev, "S3C2410_IICCON=0x%02lx\n", iicon);
-        
-        writel(iicon, i2c->regs + S3C2410_IICCON);
 
         /* check for s3c2440 i2c controller  */
 
@@ -752,9 +831,12 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 static int s3c24xx_i2c_probe(struct platform_device *pdev)
 {
         struct s3c24xx_i2c *i2c = &s3c24xx_i2c;
+        struct s3c2410_platform_i2c *pdata;
         struct resource *res;
         int ret;
 
+        pdata = s3c24xx_i2c_get_platformdata(&pdev->dev);
+
         /* find the clock and enable it */
 
         i2c->dev = &pdev->dev;
@@ -832,17 +914,34 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
         dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res,
                 (unsigned long)res->start);
 
-        ret = i2c_add_adapter(&i2c->adap);
+        ret = s3c24xx_i2c_register_cpufreq(i2c);
         if (ret < 0) {
-                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
+                dev_err(&pdev->dev, "failed to register cpufreq notifier\n");
                 goto err_irq;
         }
 
+        /* Note, previous versions of the driver used i2c_add_adapter()
+         * to add the bus at any number. We now pass the bus number via
+         * the platform data, so if unset it will now default to always
+         * being bus 0.
+         */
+
+        i2c->adap.nr = pdata->bus_num;
+
+        ret = i2c_add_numbered_adapter(&i2c->adap);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
+                goto err_cpufreq;
+        }
+
         platform_set_drvdata(pdev, i2c);
 
         dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
         return 0;
 
+ err_cpufreq:
+        s3c24xx_i2c_deregister_cpufreq(i2c);
+
  err_irq:
         free_irq(i2c->irq->start, i2c);
 
@@ -870,6 +969,8 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
 {
         struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);
 
+        s3c24xx_i2c_deregister_cpufreq(i2c);
+
         i2c_del_adapter(&i2c->adap);
         free_irq(i2c->irq->start, i2c);
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 50e0a4653741..a95cb9465d65 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -126,7 +126,7 @@ config ISP1301_OMAP
 
 config TPS65010
         tristate "TPS6501x Power Management chips"
-        depends on HAVE_GPIO_LIB
+        depends on GPIOLIB
         default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
         help
           If you say yes here you get support for the TPS6501x series of
diff --git a/drivers/i2c/chips/at24.c b/drivers/i2c/chips/at24.c
index e764c94f3e3d..2a4acb269569 100644
--- a/drivers/i2c/chips/at24.c
+++ b/drivers/i2c/chips/at24.c
@@ -188,7 +188,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
                         count = I2C_SMBUS_BLOCK_MAX;
                 status = i2c_smbus_read_i2c_block_data(client, offset,
                                 count, buf);
-                dev_dbg(&client->dev, "smbus read %zd@%d --> %d\n",
+                dev_dbg(&client->dev, "smbus read %zu@%d --> %d\n",
                                 count, offset, status);
                 return (status < 0) ? -EIO : status;
         }
@@ -214,7 +214,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
         msg[1].len = count;
 
         status = i2c_transfer(client->adapter, msg, 2);
-        dev_dbg(&client->dev, "i2c read %zd@%d --> %d\n",
+        dev_dbg(&client->dev, "i2c read %zu@%d --> %d\n",
                         count, offset, status);
 
         if (status == 2)
@@ -334,7 +334,7 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, char *buf,
                         if (status == 1)
                                 status = count;
                 }
-                dev_dbg(&client->dev, "write %zd@%d --> %zd (%ld)\n",
+                dev_dbg(&client->dev, "write %zu@%d --> %zd (%ld)\n",
                                 count, offset, status, jiffies);
 
                 if (status == count)
@@ -512,7 +512,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
         i2c_set_clientdata(client, at24);
 
-        dev_info(&client->dev, "%Zd byte %s EEPROM %s\n",
+        dev_info(&client->dev, "%zu byte %s EEPROM %s\n",
                 at24->bin.size, client->name,
                 writable ? "(writable)" : "(read-only)");
         dev_dbg(&client->dev,
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 03a33f1b9cd3..4655b794ebe3 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -33,7 +33,7 @@
 #include <linux/workqueue.h>
 
 #include <asm/irq.h>
-#include <asm/arch/usb.h>
+#include <mach/usb.h>
 
 
 #ifndef DEBUG
@@ -94,7 +94,7 @@ struct isp1301 {
 /* board-specific PM hooks */
 
 #include <asm/gpio.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 #include <asm/mach-types.h>
 
 
@@ -1593,7 +1593,7 @@ fail1:
         if (machine_is_omap_h2()) {
                 /* full speed signaling by default */
                 isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1,
-                        MC1_SPEED_REG);
+                        MC1_SPEED);
                 isp1301_set_bits(isp, ISP1301_MODE_CONTROL_2,
                         MC2_SPD_SUSP_CTRL);
 
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index b36db1797c11..176126d3a01d 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -41,11 +41,10 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 
-#include <asm/mach-types.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
+#include <mach/gpio.h>
+#include <mach/menelaus.h>
 
 #define DRIVER_NAME                     "menelaus"
 
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 85949685191b..cf02e8fceb42 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -636,6 +636,8 @@ static int tps65010_probe(struct i2c_client *client,
                 tps->outmask = board->outmask;
 
                 tps->chip.label = client->name;
+                tps->chip.dev = &client->dev;
+                tps->chip.owner = THIS_MODULE;
 
                 tps->chip.set = tps65010_gpio_set;
                 tps->chip.direction_output = tps65010_output;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 7bf38c418086..550853f79ae8 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -813,7 +813,12 @@ static int i2c_check_addr(struct i2c_adapter *adapter, int addr)
 int i2c_attach_client(struct i2c_client *client)
 {
         struct i2c_adapter *adapter = client->adapter;
-        int res = 0;
+        int res;
+
+        /* Check for address business */
+        res = i2c_check_addr(adapter, client->addr);
+        if (res)
+                return res;
 
         client->dev.parent = &client->adapter->dev;
         client->dev.bus = &i2c_bus_type;
@@ -1451,9 +1456,11 @@ i2c_new_probed_device(struct i2c_adapter *adap,
                 if ((addr_list[i] & ~0x07) == 0x30
                  || (addr_list[i] & ~0x0f) == 0x50
                  || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) {
+                        union i2c_smbus_data data;
+
                         if (i2c_smbus_xfer(adap, addr_list[i], 0,
                                            I2C_SMBUS_READ, 0,
-                                           I2C_SMBUS_BYTE, NULL) >= 0)
+                                           I2C_SMBUS_BYTE, &data) >= 0)
                                 break;
                 } else {
                         if (i2c_smbus_xfer(adap, addr_list[i], 0,
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 9d55c6383b23..af4491fa7e34 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -147,7 +147,7 @@ static ssize_t i2cdev_read (struct file *file, char __user *buf, size_t count,
         if (tmp==NULL)
                 return -ENOMEM;
 
-        pr_debug("i2c-dev: i2c-%d reading %zd bytes.\n",
+        pr_debug("i2c-dev: i2c-%d reading %zu bytes.\n",
                 iminor(file->f_path.dentry->d_inode), count);
 
         ret = i2c_master_recv(client,tmp,count);
@@ -175,7 +175,7 @@ static ssize_t i2cdev_write (struct file *file, const char __user *buf, size_t c
                 return -EFAULT;
         }
 
-        pr_debug("i2c-dev: i2c-%d writing %zd bytes.\n",
+        pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n",
                 iminor(file->f_path.dentry->d_inode), count);
 
         ret = i2c_master_send(client,tmp,count);