Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

Pull i2c-embedded changes from Wolfram Sang:
 "The changes for i2c-embedded include:

   - massive rework of the omap driver
   - massive rework of the at91 driver.  In fact, the old driver gets
     removed; I am okay with this approach since the old driver was
     depending on BROKEN and its limitations made it practically
     unusable, so people used bitbanging instead.  But even if there are
     users, there is no platform_data or module parameter which would
     need to be converted.  It is just another driver doing I2C
     transfers, just way better.  Modifications of arch/arm/at91 related
     files have proper acks from the maintainer.
   - new driver for R-Car I2C
   - devicetree and generic_clock conversions and fixes
   - usual driver fixes and changes.

  The rework patches have come a long way and lots of people have been
  involved in creating/testing them.  Most patches have been in
  linux-next at least since 3.6-rc5.  A few have been added in the last
  week, I have to admit.

  An unexpected (but welcome :)) peak in private life is the cause for
  that.  The "late" patches shouldn't cause any merge conflicts and I
  will have a special eye on them during the stabilization phase.  This
  is an exception and I want to have the patches in place properly in
  time again for the next kernels."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
  MXS: Implement DMA support into mxs-i2c
  i2c: add Renesas R-Car I2C driver
  i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
  ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
  i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
  i2c: algo: pca: Fix chip reset function for PCA9665
  i2c: mpc: Wait for STOP to hit the bus
  i2c: davinci: preparation for switch to common clock framework
  omap-i2c: fix incorrect log message when using a device tree
  i2c: omap: sanitize exit path
  i2c: omap: switch over to autosuspend API
  i2c: omap: remove unnecessary pm_runtime_suspended check
  i2c: omap: switch to threaded IRQ support
  i2c: omap: remove redundant status read
  i2c: omap: get rid of the "complete" label
  i2c: omap: resize fifos before each message
  i2c: omap: simplify IRQ exit path
  i2c: omap: always return IRQ_HANDLED
  i2c: omap: simplify errata check
  i2c: omap: bus: add a receiver flag
  ...

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/plat-omap/i2c.c
index 6013831a043e320fafd5e718a558d422fa67a624,dba8338f6cd7682b84a9248feb81159dcef893c8..a5683a84c6ee0e313cb8f9daeeb7c72106952a4e
--- 1/arch/arm/plat-omap/i2c.c
--- 2/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@@ -32,8 -31,8 +31,7 @@@
  #include <linux/clk.h>
  
  #include <mach/irqs.h>
 -#include <plat/mux.h>
  #include <plat/i2c.h>
- #include <plat/omap-pm.h>
  #include <plat/omap_device.h>
  
  #define OMAP_I2C_SIZE         0x3f

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-davinci.c
index 79a2542d8c41564b1c2b7a337e23a8a0282cda4f,85ce548ff1526672fe383c663e97a75814704ce7..6a0a5531944994803b94cbbe95b8badf7bdbb42c
--- 1/drivers/i2c/busses/i2c-davinci.c
--- 2/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@@ -38,9 -38,11 +38,11 @@@
  #include <linux/slab.h>
  #include <linux/cpufreq.h>
  #include <linux/gpio.h>
+ #include <linux/of_i2c.h>
+ #include <linux/of_device.h>
  
  #include <mach/hardware.h>
 -#include <mach/i2c.h>
 +#include <linux/platform_data/i2c-davinci.h>
  
  /* ----- global defines ----------------------------------------------- */
  

diff --cc drivers/i2c/busses/i2c-imx.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mpc.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
index a0e49f6aaf96eaa81ac712a4a279fafbdf13af95,b6c6b95d4a0772615e3bb356e2c821062726606a..db31eaed6ea59b32083df49f757c1fc949c60303
--- 1/drivers/i2c/busses/i2c-omap.c
--- 2/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@@ -943,12 -1057,11 +1057,12 @@@ omap_i2c_probe(struct platform_device *
  {
        struct omap_i2c_dev     *dev;
        struct i2c_adapter      *adap;
-       struct resource         *mem, *irq, *ioarea;
+       struct resource         *mem;
 -      struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
 +      const struct omap_i2c_bus_platform_data *pdata =
 +              pdev->dev.platform_data;
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
-       irq_handler_t isr;
+       int irq;
        int r;
  
        /* NOTE: driver uses the static register mapping */

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge