diff options
| author | Linus Torvalds <[email protected]> | 2016-05-19 17:48:12 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-05-19 17:48:12 -0700 | 
| commit | 78975f23cba0cd195db01cdbd6eb48138a655890 (patch) | |
| tree | 0e808c0cfe220bd8fb00d66985d71655345904cb /drivers/gpu/drm/tilcdc | |
| parent | feaa7cb5c59416143432829b15826be76605b8fe (diff) | |
| parent | 73e8b0528346e88a0624f2d9821f382cd6256677 (diff) | |
Merge branch 'i2c/for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang:
 - Peter Rosin did some major rework on the locking of i2c muxes by
   seperating parent-locked muxes and mux-locked muxes.
   This avoids deadlocks/workarounds when the mux itself needs i2c
   commands for muxing.  And as a side-effect, other workarounds in the
   media layer could be eliminated.  Also, Peter stepped up as the i2c
   mux maintainer and will keep an eye on these changes.
 - major updates to the octeon driver
 - add a helper to the core to generate the address+rw_bit octal and
   make drivers use it
 - quite a bunch of driver updates
* 'i2c/for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (84 commits)
  i2c: rcar: add DMA support
  i2c: st: Implement bus clear
  i2c: only check scl functions when using generic recovery
  i2c: algo-bit: declare i2c_bit_quirk_no_clk_stretch as static
  i2c: tegra: disable clock before returning error
  [media] rtl2832: regmap is aware of lockdep, drop local locking hack
  [media] rtl2832_sdr: get rid of empty regmap wrappers
  [media] rtl2832: change the i2c gate to be mux-locked
  [media] si2168: change the i2c gate to be mux-locked
  iio: imu: inv_mpu6050: change the i2c gate to be mux-locked
  i2c: mux: document i2c muxes and elaborate on parent-/mux-locked muxes
  i2c: mux: relax locking of the top i2c adapter during mux-locked muxing
  i2c: muxes always lock the parent adapter
  i2c: allow adapter drivers to override the adapter locking
  i2c: uniphier: add "\n" at the end of error log
  i2c: mv64xxx: remove CONFIG_HAVE_CLK conditionals
  i2c: mv64xxx: use clk_{prepare_enable,disable_unprepare}
  i2c: mv64xxx: handle probe deferral for the clock
  i2c: mv64xxx: enable the driver on ARCH_MVEBU
  i2c: octeon: Add workaround for broken irqs on CN3860
  ...
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
0 files changed, 0 insertions, 0 deletions