diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 23:00:00 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 23:00:00 +0400 |
| commit | fe504c5c745aeb767d978fbedeb94775fd4cb69c (patch) | |
| tree | 5ebb384972aabf676d8137d95362333193c89f66 /sound/soc/ux500/ux500_pcm.h | |
| parent | 698d601224824bc1a5bf17f3d86be902e2aabff0 (diff) | |
| parent | d7460f4a3d75469deb1c6c028961da69608d02d9 (diff) | |
| download | linux-fe504c5c745aeb767d978fbedeb94775fd4cb69c.tar.xz | |
Merge tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates, take 2 from Olof Johansson:
"This branch contains board updates for shmobile that had dependencies
on earlier branches past the first driver branch, and thus are merged
separately.
Most of these are to enable audio and USB on shmobile. They contain a
dependent ASoC branch that has been coordinated with Mark Brown."
* tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: shmobile: mackerel: Add FLCTL IRQ resource
ARM: shmobile: use FSI driver's audio clock on ap4evb
ARM: shmobile: use FSI driver's audio clock on mackerel
ARM: shmobile: use FSI driver's audio clock on armadillo800eva
ARM: shmobile: mackerel: enable DMAEngine on USB Host
ARM: shmobile: marzen: add USB OHCI driver support
ARM: shmobile: marzen: add USB EHCI driver support
ARM: shmobile: marzen: add USB phy support
ASoC: fsi: add master clock control functions
ASoC: fsi: care fsi_hw_start/stop() return value
ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only
ASoC: fsi: use devm_request_irq()
ASoC: fsi: fixup channels_min/max
Diffstat (limited to 'sound/soc/ux500/ux500_pcm.h')
0 files changed, 0 insertions, 0 deletions