1
0
Fork 0
alistair23-linux/sound/soc
Linus Torvalds 00341b5301 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang:
 "Highlights:

   - OF and ACPI helpers are now included in the core, and not in
     external files anymore.  This removes dependency problems for
     modules and is cleaner, in general.
   - mv64xxx-driver gains fifo usage to support mv78230
   - imx-driver overhaul to support VF610
   - various cleanups, most notably related to devm_* and CONFIG_PM
     usage
   - driver bugfixes and smaller feature additions"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (51 commits)
  i2c: rcar: add rcar-H2 support
  i2c: sirf: retry 3 times as sometimes we get random noack and timeout
  i2c: sirf: support reverse direction of address
  i2c: sirf: fix the typo for setting bitrate to less than 100k
  i2c: sirf: we need to wait I2C_RESET status in resume
  i2c: sirf: reset i2c controller early after we get a noack
  i2c: designware: get SDA hold time, HCNT and LCNT configuration from ACPI
  i2c: designware: make HCNT/LCNT values configurable
  i2c: mpc: cleanup clock API use
  i2c: pnx: fix error return code in i2c_pnx_probe()
  i2c: ismt: add error return code in probe()
  i2c: mv64xxx: fix typo in binding documentation
  i2c: imx: use exact SoC revision to document binding
  i2c: move ACPI helpers into the core
  i2c: move OF helpers into the core
  i2c: mv64xxx: Fix timing issue on Armada XP (errata FE-8471889)
  i2c: mv64xxx: Add I2C Transaction Generator support
  i2c: powermac: fix return path on error
  Documentation: i2c: Fix example in instantiating-devices
  i2c: tiny-usb: do not use stack as URB transfer_buffer
  ...
2013-09-05 09:31:03 -07:00
..
atmel Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next 2013-08-22 14:28:28 +01:00
au1x Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next 2013-08-22 14:28:29 +01:00
blackfin ASoC: bf5xx-ac97: Remove unused extern declaration 2013-07-30 13:01:09 +01:00
cirrus Merge remote-tracking branch 'asoc/topic/ep93xx' into tmp 2013-08-30 11:04:21 +01:00
codecs Merge remote-tracking branch 'asoc/topic/ssm2602' into tmp 2013-09-01 21:15:59 +01:00
davinci sound updates for 3.11 2013-07-03 19:52:22 -07:00
dwc ASoC: designware_i2s: Remove unnecessary dev_set_drvdata() 2013-08-29 13:18:32 +01:00
fsl Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-09-05 09:31:03 -07:00
generic ASoC: simple-card: Provide owner and MODULE_ALIAS() 2013-08-23 19:04:20 +01:00
jz4740 ASoC: jz4740-i2s: Use clk_prepare_enable/clk_disable_unprepare 2013-05-12 22:09:03 +04:00
kirkwood ASoc: kirkwood: Use the Kirkwood audio driver in Dove boards 2013-08-27 22:01:59 +01:00
mid-x86 ASoC: mfld: Remove unused variable 2013-06-28 10:59:14 +01:00
mxs Merge remote-tracking branch 'asoc/topic/fsl' into tmp 2013-09-01 21:15:52 +01:00
nuc900 ASoC: nuc900: don't check resource with devm_ioremap_resource 2013-07-24 15:34:16 +01:00
omap ASoC: Updates for v3.12 2013-08-23 14:12:22 +02:00
pxa ASoC: pxa: Remove duplicate inclusion of dmaengine.h 2013-08-22 10:43:49 +01:00
s6000 ASoC: s6105-ipcam: Fix incorrect placement of __initdata 2013-08-08 14:27:59 +01:00
samsung Merge remote-tracking branch 'asoc/topic/samsung' into tmp 2013-08-30 11:04:29 +01:00
sh Merge remote-tracking branch 'asoc/topic/fsi' into tmp 2013-08-30 11:04:22 +01:00
spear ALSA: move dmaengine implementation from ASoC to ALSA core 2013-08-15 11:18:09 +01:00
tegra Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next 2013-08-22 14:28:52 +01:00
txx9 ASoC: txx9: don't check resource with devm_ioremap_resource 2013-07-24 15:37:48 +01:00
ux500 ASoC: mop500: add .owner to struct snd_soc_card 2013-07-15 11:12:24 +01:00
Kconfig ALSA: move dmaengine implementation from ASoC to ALSA core 2013-08-15 11:18:09 +01:00
Makefile ALSA: move dmaengine implementation from ASoC to ALSA core 2013-08-15 11:18:09 +01:00
soc-cache.c ASoC: cache: Standardise ASoC cache messages 2012-11-21 11:39:51 +09:00
soc-compress.c ASoC: compress: Use power efficient workqueue 2013-08-12 11:04:54 +01:00
soc-core.c Merge remote-tracking branch 'asoc/topic/core' into tmp 2013-08-30 11:04:14 +01:00
soc-dapm.c Merge remote-tracking branch 'asoc/topic/dapm' into tmp 2013-09-01 21:15:50 +01:00
soc-generic-dmaengine-pcm.c ASoC: generic-dmaengine-pcm: call dma_request_slave_channel() 2013-04-23 11:34:29 +01:00
soc-io.c PTR_RET is now PTR_ERR_OR_ZERO(): Replace most. 2013-07-15 11:25:01 +09:30
soc-jack.c ASoC: jack: Remove unnecessary call to snd_soc_dapm_new_widgets() 2013-08-27 15:37:33 +01:00
soc-pcm.c Merge remote-tracking branch 'asoc/topic/fsl' into tmp 2013-09-01 21:15:52 +01:00
soc-utils.c ASoC: simplify registration of snd-soc-dummy device 2013-05-17 12:07:49 +01:00