Merge branch 'chromeos-intel_i2c-3.4' into chromeos-3.4
authorOlof Johansson <olof@lixom.net>
Fri, 1 Jun 2012 07:06:22 +0000 (00:06 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 1 Jun 2012 07:06:22 +0000 (00:06 -0700)
By Daniel Kurtz (19) and others
* chromeos-intel_i2c-3.4: (21 commits)
  CHROMIUM: drm/i915/intel_i2c: Allow 400khz for cyapa
  CHROMIUM: drm/i915/intel_i2c: enable 400kHz GMBUS for atmel_mxt devices
  CHROMIUM: drm/i915/intel_drv: reduce wait_for polling time
  UPSTREAM: drm/i915/intel_i2c: reduce verbosity of some messages
  UPSTREAM: drm/i915/intel_i2c: handle zero-length reads
  UPSTREAM: drm/i915/intel_i2c: reuse GMBUS2 value read in polling loop
  UPSTREAM: drm/i915/intel_i2c: remove POSTING_READ() from gmbus transfers
  UPSTREAM: drm/i915/intel_i2c: use INDEX cycles for i2c read transactions
  UPSTREAM: drm/i915/intel_i2c: use WAIT cycle, not STOP
  UPSTREAM: drm/i915/intel_i2c: always wait for IDLE before clearing NAK
  UPSTREAM: drm/i915/intel_i2c: use double-buffered writes
  UPSTREAM: drm/i915/intel_i2c: handle zero-length writes
  UPSTREAM: drm/i915/intel_i2c: allocate gmbus array as part of drm_i915_private
  UPSTREAM: drm/i915/intel_i2c: gmbus disabled and reserved ports are invalid
  UPSTREAM: drm/i915/intel_i2c: refactor using intel_gmbus_get_adapter
  UPSTREAM: drm/i915/intel_i2c: use i2c pre/post_xfer functions to setup gpio xfers
  UPSTREAM: drm/i915/intel_i2c: assign HDMI port D to pin pair 6
  UPSTREAM: drm/i915/intel_i2c: cleanup error messages and comments
  UPSTREAM: drm/i915/intel_i2c: refactor gmbus_xfer
  UPSTREAM: drm/i915: enable gmbus on gen2
  ...

1  2 
drivers/gpu/drm/i915/intel_bios.c

Simple merge