i2c-next pull request

i2c-next pull request

[Ben Dooks]

The following changes since commit 4a6908a3a050aacc9c3a2f36b276b46c0629ad91:
  Linus Torvalds (1):
        Linux 2.6.28

are available in the git repository at:

  git://aeryn.fluff.org.uk/bjdooks/linux.git i2c-next

Ben Dooks (8):
      i2c-s3c2410: Fixup style problems from checkpatch.pl
      i2c-s3c2410: Use platform data for gpio configuration
      i2c-s3c2410: Remove default platform data.
      i2c-s3c2410: Allow more than one i2c-s3c2410 adapter
      i2c-s3c2410: Change IRQ to be plain integer.
      Merge branch 'i2c-for-ben' of git://git.kernel.org/.../tmlind/linux-omap-2.6 into i2c-next
      i2c-omap: fix type of irq handler function
      Merge branch 'i2c-next-s3c' into i2c-next

Chandra shekhar (1):
      i2c-omap: Add support for omap34xx

Jarkko Nikula (1):
      i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg

Kalle Jokiniemi (1):
      i2c-omap: Enable I2C wakeups for 34xx

Nishanth Menon (1):
      i2c-omap: FIFO handling support and broken hw workaround for i2c-omap

Paul Walmsley (6):
      i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr()
      i2c-omap: Mark init-only functions as __init
      i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
      i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()
      i2c-omap: convert 'rev1' flag to generic 'rev' u8
      i2c-omap: reprogram OCP_SYSCONFIG register after reset

Syed Mohammed Khasim (1):
      i2c-omap: Add high-speed support to omap-i2c

Tony Lindgren (1):
      i2c-omap: Clean-up i2c-omap

 arch/arm/mach-omap2/clock24xx.h  |    4 +-
 drivers/i2c/busses/i2c-omap.c    |  420 +++++++++++++++++++++++++++++---------
 drivers/i2c/busses/i2c-s3c2410.c |  185 +++++++----------
 3 files changed, 408 insertions(+), 201 deletions(-)

Re: i2c-next pull request

[Linus Torvalds]

On Mon, 5 Jan 2009, Ben Dooks wrote:
>
> are available in the git repository at:
> 
>   git://aeryn.fluff.org.uk/bjdooks/linux.git i2c-next

I fixed up a conflict that _looked_ trivial in 
drivers/i2c/busses/i2c-s3c2410.c, and since I can't even compile-test it, 
you should double-check. We had one branch remove the need for 
regs-gpio.h, and the ARM merge had moved the header files around..

All the commits in question were actually yours, they just came in from 
different trees. So if it's not right, I'm sure you can fix it up ;)

		Linus

Re: i2c-next pull request

[Ben Dooks]

On Mon, Jan 05, 2009 at 07:01:34PM -0800, Linus Torvalds wrote:
> 
> 
> On Mon, 5 Jan 2009, Ben Dooks wrote:
> >
> > are available in the git repository at:
> > 
> >   git://aeryn.fluff.org.uk/bjdooks/linux.git i2c-next
> 
> I fixed up a conflict that _looked_ trivial in 
> drivers/i2c/busses/i2c-s3c2410.c, and since I can't even compile-test it, 
> you should double-check. We had one branch remove the need for 
> regs-gpio.h, and the ARM merge had moved the header files around..
> 
> All the commits in question were actually yours, they just came in from 
> different trees. So if it's not right, I'm sure you can fix it up ;)

Thanks, it compiles fine on the s3c6400, will test the s3c24xx build
later.

-- 
Ben (ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'