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

Pull i2c-embedded changes from Wolfram Sang:
 - CBUS driver (an I2C variant)
 - continued rework of the omap driver
 - s3c2410 gets lots of fixes and gains pinctrl support
 - at91 gains DMA support
 - the GPIO muxer gains devicetree probing
 - typical fixes and additions all over

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (45 commits)
  i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag
  i2c: at91: add dma support
  i2c: at91: change struct members indentation
  i2c: at91: fix compilation warning
  i2c: mxs: Do not disable the I2C SMBus quick mode
  i2c: mxs: Handle i2c DMA failure properly
  i2c: s3c2410: Remove recently introduced performance overheads
  i2c: ocores: Move grlib set/get functions into #ifdef CONFIG_OF block
  i2c: s3c2410: Add fix for i2c suspend/resume
  i2c: s3c2410: Fix code to free gpios
  i2c: i2c-cbus-gpio: introduce driver
  i2c: ocores: Add support for the GRLIB port of the controller and use function pointers for getreg and setreg functions
  i2c: ocores: Add irq support for sparc
  i2c: omap: Move the remove constraint
  ARM: dts: cfa10049: Add the i2c muxer buses to the CFA-10049
  i2c: s3c2410: do not special case HDMIPHY stuck bus detection
  i2c: s3c2410: use exponential back off while polling for bus idle
  i2c: s3c2410: do not generate STOP for QUIRK_HDMIPHY
  i2c: s3c2410: grab adapter lock while changing i2c clock
  i2c: s3c2410: Add support for pinctrl
  ...

diff --cc Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
Simple merge

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

diff --cc arch/arm/mach-omap2/board-n8x0.c
index a4e167c,bbfd742..0abb30f
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -20,9 -21,9 +21,10 @@@
  #include <linux/i2c.h>
  #include <linux/spi/spi.h>
  #include <linux/usb/musb.h>
+ #include <linux/platform_data/i2c-cbus-gpio.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/mtd-onenand-omap2.h>
 +#include <linux/mfd/menelaus.h>
  #include <sound/tlv320aic3x.h>
  
  #include <asm/mach/arch.h>

diff --cc arch/arm/mach-omap2/i2c.c
index fbb9b15,fc57e67..df6d6ac
--- 1/arch/arm/mach-omap2/i2c.c
--- 2/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@@ -106,62 -104,3 +106,81 @@@ int omap_i2c_reset(struct omap_hwmod *o
  
        return 0;
  }
 +
 +static int __init omap_i2c_nr_ports(void)
 +{
 +      int ports = 0;
 +
 +      if (cpu_is_omap24xx())
 +              ports = 2;
 +      else if (cpu_is_omap34xx())
 +              ports = 3;
 +      else if (cpu_is_omap44xx())
 +              ports = 4;
 +      return ports;
 +}
 +
++/*
++ * XXX This function is a temporary compatibility wrapper - only
++ * needed until the I2C driver can be converted to call
++ * omap_pm_set_max_dev_wakeup_lat() and handle a return code.
++ */
++static void omap_pm_set_max_mpu_wakeup_lat_compat(struct device *dev, long t)
++{
++      omap_pm_set_max_mpu_wakeup_lat(dev, t);
++}
++
 +static const char name[] = "omap_i2c";
 +
 +int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,
 +                              int bus_id)
 +{
 +      int l;
 +      struct omap_hwmod *oh;
 +      struct platform_device *pdev;
 +      char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];
 +      struct omap_i2c_bus_platform_data *pdata;
 +      struct omap_i2c_dev_attr *dev_attr;
 +
 +      if (bus_id > omap_i2c_nr_ports())
 +              return -EINVAL;
 +
 +      omap2_i2c_mux_pins(bus_id);
 +
 +      l = snprintf(oh_name, MAX_OMAP_I2C_HWMOD_NAME_LEN, "i2c%d", bus_id);
 +      WARN(l >= MAX_OMAP_I2C_HWMOD_NAME_LEN,
 +              "String buffer overflow in I2C%d device setup\n", bus_id);
 +      oh = omap_hwmod_lookup(oh_name);
 +      if (!oh) {
 +                      pr_err("Could not look up %s\n", oh_name);
 +                      return -EEXIST;
 +      }
 +
 +      pdata = i2c_pdata;
 +      /*
 +       * pass the hwmod class's CPU-specific knowledge of I2C IP revision in
 +       * use, and functionality implementation flags, up to the OMAP I2C
 +       * driver via platform data
 +       */
 +      pdata->rev = oh->class->rev;
 +
 +      dev_attr = (struct omap_i2c_dev_attr *)oh->dev_attr;
 +      pdata->flags = dev_attr->flags;
 +
++      /*
++       * When waiting for completion of a i2c transfer, we need to
++       * set a wake up latency constraint for the MPU. This is to
++       * ensure quick enough wakeup from idle, when transfer
++       * completes.
++       * Only omap3 has support for constraints
++       */
++      if (cpu_is_omap34xx())
++              pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat;
 +      pdev = omap_device_build(name, bus_id, oh, pdata,
 +                      sizeof(struct omap_i2c_bus_platform_data),
 +                      NULL, 0, 0);
 +      WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
 +
 +      return PTR_RET(pdev);
 +}
 +

diff --cc arch/arm/mach-omap2/omap_hwmod_2430_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

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

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

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

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