Merge tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

eeab517b · Linus Torvalds <[email protected]> · 2013-11-12 15:29:53 +09:00

Pull sound updates from Takashi Iwai:
 "There are no too intrusive changes in this update batch.  The biggest
  LOC is found in the new DICE driver, and other small changes are
  scattered over the whole sound subtree (which is a common pattern).

  Below are highlights:

   - ALSA core:
     * Memory allocation support with genpool
     * Fix blocking in drain ioctl of compress_offload

   - HD-audio:
     * Improved AMD HDMI supports
     * Intel HDMI detection improvements
     * thinkpad_acpi mute-key integration
     * New PCI ID, New ALC255,285,293 codecs, CX20952

   - USB-audio:
     * New buffer size management
     * Clean up endpoint handling codes

   - ASoC:
     * Further work on the dmaengine helpers, including support for
       configuring the parameters for DMA by reading the capabilities of
       the DMA controller which removes some guesswork and magic numbers
       from drivers.
     * A refresh of the documentation.
     * Conversions of many drivers to direct regmap API usage in order
       to allow the ASoC level register I/O code to be removed, this
       will hopefully be completed by v3.14.
     * Support for using async register I/O in DAPM, reducing the time
       taken to implement power transitions on systems that support it.

   - Firewire: DICE driver

   - Lots of small fixes for bugs reported by Coverity"

* tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (382 commits)
  ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported
  ALSA: hda - Apply MacBook fixups for CS4208 correctly
  ASoC: fsl: imx-wm8962: remove an unneeded check
  ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
  ALSA: hda/realtek - Make fixup regs persist after resume
  ALSA: hda_intel: ratelimit "spurious response" message
  ASoC: generic-dmaengine-pcm: Use SNDRV_DMA_TYPE_DEV_IRAM as default
  ASoC: dapm: Use WARN_ON() instead of BUG_ON()
  ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages
  ASoC: Replace BUG() with WARN()
  ASoC: wm_hubs: Replace BUG() with WARN()
  ASoC: wm8996: Replace BUG() with WARN()
  ASoC: wm8962: Replace BUG() with WARN()
  ASoC: wm8958: Replace BUG() with WARN()
  ASoC: wm8904: Replace BUG() with WARN()
  ASoC: wm8900: Replace BUG() with WARN()
  ASoC: wm8350: Replace BUG() with WARN()
  ASoC: txx9: Use WARN_ON() instead of BUG_ON()
  ASoC: sh: Use WARN_ON() instead of BUG_ON()
  ASoC: rcar: Use WARN_ON() instead of BUG_ON()
  ...

Commit: eeab517b68beb9e044e869bee18e3bdfa60e5aca
Parents: f095ca6b · a6bc732b

Merge commit. Changes below are compared with the first parent: f095ca6b.

Changes

253 files changed · +8589 −3973

File	Status	Add	Del	Content
Documentation/devicetree/bindings/sound/cs42l73.txt	added	+22	−0	View file
Documentation/devicetree/bindings/sound/davinci-evm-audio.txt	added	+42	−0	View file
Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt	modified	+27	−14	View file
Documentation/devicetree/bindings/sound/tlv320aic3x.txt	modified	+26	−0	View file
Documentation/devicetree/bindings/sound/tpa6130a2.txt	added	+27	−0	View file
Documentation/ioctl/ioctl-number.txt	modified	+1	−0	View file
Documentation/laptops/thinkpad-acpi.txt	modified	+5	−2	View file
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+1	−1	View file
Documentation/sound/alsa/Audiophile-Usb.txt	modified	+1	−1	View file
Documentation/sound/alsa/CMIPCI.txt	modified	+1	−1	View file
Documentation/sound/alsa/compress_offload.txt	modified	+3	−3	View file
Documentation/sound/alsa/soc/DPCM.txt	added	+380	−0	View file
Documentation/sound/alsa/soc/codec.txt	modified	+15	−31	View file
Documentation/sound/alsa/soc/dapm.txt	modified	+42	−31	View file
Documentation/sound/alsa/soc/machine.txt	modified	+4	−2	View file
Documentation/sound/alsa/soc/platform.txt	modified	+16	−3	View file
drivers/mfd/mc13xxx-core.c	modified	+0	−5	View file
drivers/mfd/mc13xxx-spi.c	modified	+5	−0	View file
drivers/platform/x86/thinkpad_acpi.c	modified	+91	−1	View file
include/linux/mfd/mc13xxx.h	modified	+7	−0	View file
include/linux/platform_data/davinci_asp.h	modified	+2	−0	View file
include/linux/thinkpad_acpi.h	added	+15	−0	View file
include/sound/ak4114.h	modified	+2	−2	View file
include/sound/compress_driver.h	modified	+9	−0	View file
include/sound/cs42l52.h	modified	+2	−0	View file
include/sound/cs42l73.h	added	+22	−0	View file
include/sound/dmaengine_pcm.h	modified	+8	−0	View file
include/sound/memalloc.h	modified	+5	−0	View file
include/sound/rcar_snd.h	modified	+0	−1	View file
include/sound/soc-dai.h	modified	+17	−0	View file
include/sound/soc-dapm.h	modified	+4	−0	View file
include/sound/soc.h	modified	+32	−68	View file
include/trace/events/asoc.h	modified	+1	−0	View file
include/uapi/sound/Kbuild	modified	+1	−0	View file
include/uapi/sound/asound.h	modified	+2	−1	View file
include/uapi/sound/firewire.h	added	+51	−0	View file
sound/arm/pxa2xx-ac97-lib.c	modified	+12	−19	View file
sound/arm/pxa2xx-ac97.c	modified	+1	−1	View file
sound/atmel/ac97c.c	modified	+0	−1	View file
sound/core/compress_offload.c	modified	+48	−6	View file
sound/core/init.c	modified	+2	−2	View file
sound/core/memalloc.c	modified	+61	−0	View file
sound/core/pcm_dmaengine.c	modified	+9	−13	View file
sound/core/pcm_native.c	modified	+10	−0	View file
sound/drivers/opl3/opl3_midi.c	modified	+5	−0	View file
sound/drivers/pcsp/pcsp.c	modified	+2	−1	View file
sound/firewire/Kconfig	modified	+15	−0	View file
sound/firewire/Makefile	modified	+2	−0	View file
sound/firewire/amdtp.c	modified	+157	−56	View file
sound/firewire/amdtp.h	modified	+21	−25	View file
sound/firewire/cmp.c	modified	+21	−29	View file
sound/firewire/dice-interface.h	added	+371	−0	View file
sound/firewire/dice.c	added	+1494	−0	View file
sound/firewire/fcp.c	modified	+1	−1	View file
sound/firewire/isight.c	modified	+20	−23	View file
sound/firewire/lib.c	modified	+18	−6	View file
sound/firewire/lib.h	modified	+6	−1	View file
sound/firewire/scs1x.c	modified	+6	−2	View file
sound/firewire/speakers.c	modified	+7	−9	View file
sound/i2c/other/ak4114.c	modified	+4	−4	View file
sound/i2c/other/ak4xxx-adda.c	modified	+1	−1	View file
sound/isa/cmi8328.c	modified	+2	−0	View file
sound/isa/sb/sb16_csp.c	modified	+1	−0	View file
sound/mips/ad1843.c	modified	+1	−1	View file
sound/oss/sb_ess.c	modified	+1	−1	View file
sound/pci/ad1889.c	modified	+1	−1	View file
sound/pci/ali5451/ali5451.c	modified	+0	−2	View file
sound/pci/asihpi/asihpi.c	modified	+7	−2	View file
sound/pci/au88x0/au88x0_pcm.c	modified	+1	−1	View file
sound/pci/au88x0/au88x0_synth.c	modified	+10	−19	View file
sound/pci/azt3328.c	modified	+7	−7	View file
sound/pci/cs5535audio/cs5535audio_olpc.c	modified	+2	−2	View file
sound/pci/ctxfi/ctdaio.c	modified	+2	−2	View file
sound/pci/ctxfi/cthardware.c	modified	+4	−2	View file
sound/pci/emu10k1/emufx.c	modified	+45	−31	View file
sound/pci/hda/hda_auto_parser.c	modified	+1	−1	View file
sound/pci/hda/hda_beep.c	modified	+2	−3	View file
sound/pci/hda/hda_codec.c	modified	+35	−14	View file
sound/pci/hda/hda_codec.h	modified	+1	−0	View file
sound/pci/hda/hda_eld.c	modified	+156	−43	View file
sound/pci/hda/hda_generic.c	modified	+6	−2	View file
sound/pci/hda/hda_generic.h	modified	+3	−0	View file
sound/pci/hda/hda_intel.c	modified	+35	−10	View file
sound/pci/hda/hda_jack.c	modified	+1	−1	View file
sound/pci/hda/hda_jack.h	modified	+1	−0	View file
sound/pci/hda/hda_local.h	modified	+9	−18	View file
sound/pci/hda/patch_analog.c	modified	+4	−1	View file
sound/pci/hda/patch_ca0132.c	modified	+1	−1	View file
sound/pci/hda/patch_cirrus.c	modified	+27	−1	View file
sound/pci/hda/patch_conexant.c	modified	+93	−2	View file
sound/pci/hda/patch_hdmi.c	modified	+806	−208	View file
sound/pci/hda/patch_realtek.c	modified	+286	−15	View file
sound/pci/hda/patch_sigmatel.c	modified	+3	−1	View file
sound/pci/ice1712/psc724.c	modified	+2	−2	View file
sound/pci/ice1712/quartet.c	modified	+2	−0	View file
sound/pci/ice1712/wm8766.c	modified	+2	−1	View file
sound/pci/ice1712/wm8776.c	modified	+3	−2	View file
sound/pci/intel8x0.c	modified	+8	−9	View file
sound/pci/lola/lola.c	modified	+1	−1	View file
sound/pci/lx6464es/lx6464es.c	modified	+2	−2	View file
sound/pci/lx6464es/lx_core.c	modified	+2	−2	View file
sound/pci/rme96.c	modified	+4	−6	View file
sound/pci/rme9652/hdspm.c	modified	+1	−6	View file
sound/ppc/snd_ps3.c	modified	+4	−2	View file
sound/soc/Makefile	modified	+1	−1	View file
sound/soc/atmel/atmel-pcm.c	modified	+1	−1	View file
sound/soc/atmel/atmel_ssc_dai.c	modified	+1	−1	View file
sound/soc/atmel/atmel_wm8904.c	modified	+0	−8	View file
sound/soc/atmel/sam9g20_wm8731.c	modified	+1	−0	View file
sound/soc/blackfin/bf5xx-sport.c	modified	+20	−12	View file
sound/soc/cirrus/Kconfig	modified	+1	−1	View file
sound/soc/cirrus/ep93xx-pcm.c	modified	+13	−0	View file
sound/soc/codecs/88pm860x-codec.c	modified	+13	−62	View file
sound/soc/codecs/88pm860x-codec.h	modified	+58	−59	View file
sound/soc/codecs/ab8500-codec.c	modified	+45	−47	View file
sound/soc/codecs/adau1373.c	modified	+237	−61	View file
sound/soc/codecs/adav80x.c	modified	+102	−45	View file
sound/soc/codecs/ak4104.c	modified	+8	−3	View file
sound/soc/codecs/ak4641.c	modified	+1	−1	View file
sound/soc/codecs/ak4642.c	modified	+1	−3	View file
sound/soc/codecs/arizona.c	modified	+14	−9	View file
sound/soc/codecs/cq93vc.c	modified	+14	−32	View file
sound/soc/codecs/cs4271.c	modified	+1	−0	View file
sound/soc/codecs/cs42l52.c	modified	+54	−39	View file
sound/soc/codecs/cs42l52.h	modified	+1	−1	View file
sound/soc/codecs/cs42l73.c	modified	+77	−37	View file
sound/soc/codecs/cs42l73.h	modified	+52	−53	View file
sound/soc/codecs/max98088.c	modified	+278	−354	View file
sound/soc/codecs/max98095.c	modified	+180	−302	View file
sound/soc/codecs/max9850.c	modified	+29	−10	View file
sound/soc/codecs/mc13783.c	modified	+80	−57	View file
sound/soc/codecs/ml26124.c	modified	+2	−0	View file
sound/soc/codecs/pcm1681.c	modified	+1	−0	View file
sound/soc/codecs/pcm1792a.c	modified	+1	−0	View file
sound/soc/codecs/rt5640.c	modified	+25	−6	View file
sound/soc/codecs/si476x.c	modified	+16	−48	View file
sound/soc/codecs/sn95031.c	modified	+20	−15	View file
sound/soc/codecs/tas5086.c	modified	+110	−63	View file
sound/soc/codecs/tlv320aic23.c	modified	+34	−50	View file
sound/soc/codecs/tlv320aic26.c	modified	+27	−112	View file
sound/soc/codecs/tlv320aic26.h	modified	+1	−4	View file
sound/soc/codecs/tlv320aic32x4.c	modified	+30	−71	View file
sound/soc/codecs/tlv320aic3x.c	modified	+113	−121	View file
sound/soc/codecs/tpa6130a2.c	modified	+37	−16	View file
sound/soc/codecs/twl4030.c	modified	+36	−44	View file
sound/soc/codecs/twl6040.c	modified	+7	−19	View file
sound/soc/codecs/wm0010.c	modified	+6	−5	View file
sound/soc/codecs/wm2000.c	modified	+10	−5	View file
sound/soc/codecs/wm5100.c	modified	+2	−1	View file
sound/soc/codecs/wm5110.c	modified	+12	−0	View file
sound/soc/codecs/wm8350.c	modified	+1	−1	View file
sound/soc/codecs/wm8400.c	modified	+20	−75	View file
sound/soc/codecs/wm8580.c	modified	+1	−1	View file
sound/soc/codecs/wm8776.c	modified	+2	−1	View file
sound/soc/codecs/wm8900.c	modified	+7	−4	View file
sound/soc/codecs/wm8904.c	modified	+3	−2	View file
sound/soc/codecs/wm8958-dsp2.c	modified	+1	−1	View file
sound/soc/codecs/wm8962.c	modified	+121	−115	View file
sound/soc/codecs/wm8996.c	modified	+8	−6	View file
sound/soc/codecs/wm9713.c	modified	+2	−1	View file
sound/soc/codecs/wm_adsp.c	modified	+31	−18	View file
sound/soc/codecs/wm_hubs.c	modified	+1	−1	View file
sound/soc/davinci/Kconfig	modified	+15	−3	View file
sound/soc/davinci/Makefile	modified	+1	−0	View file
sound/soc/davinci/davinci-evm.c	modified	+166	−22	View file
sound/soc/davinci/davinci-mcasp.c	modified	+117	−52	View file
sound/soc/davinci/davinci-mcasp.h	modified	+12	−0	View file
sound/soc/fsl/eukrea-tlv320.c	modified	+10	−5	View file
sound/soc/fsl/fsl_spdif.c	modified	+5	−18	View file
sound/soc/fsl/fsl_ssi.c	modified	+7	−15	View file
sound/soc/fsl/imx-audmux.c	modified	+5	−4	View file
sound/soc/fsl/imx-mc13783.c	modified	+1	−0	View file
sound/soc/fsl/imx-pcm-dma.c	modified	+1	−3	View file
sound/soc/fsl/imx-pcm-fiq.c	modified	+2	−20	View file
sound/soc/fsl/imx-sgtl5000.c	modified	+2	−2	View file
sound/soc/fsl/imx-spdif.c	modified	+1	−3	View file
sound/soc/fsl/imx-ssi.c	modified	+0	−3	View file
sound/soc/fsl/imx-wm8962.c	modified	+3	−4	View file
sound/soc/generic/simple-card.c	modified	+5	−0	View file
sound/soc/kirkwood/kirkwood-dma.c	modified	+2	−4	View file
sound/soc/kirkwood/kirkwood-i2s.c	modified	+88	−20	View file
sound/soc/kirkwood/kirkwood-openrd.c	modified	+1	−1	View file
sound/soc/kirkwood/kirkwood-t5325.c	modified	+1	−1	View file
sound/soc/kirkwood/kirkwood.h	modified	+2	−2	View file
sound/soc/mid-x86/mfld_machine.c	modified	+1	−9	View file
sound/soc/mid-x86/sst_platform.c	modified	+4	−2	View file
sound/soc/mxs/mxs-saif.c	modified	+28	−14	View file
sound/soc/mxs/mxs-saif.h	modified	+5	−0	View file
sound/soc/mxs/mxs-sgtl5000.c	modified	+3	−17	View file
sound/soc/omap/n810.c	modified	+5	−2	View file
sound/soc/omap/omap-mcpdm.c	modified	+3	−9	View file
sound/soc/omap/omap-twl4030.c	modified	+2	−3	View file
sound/soc/pxa/brownstone.c	modified	+1	−0	View file
sound/soc/pxa/corgi.c	modified	+1	−0	View file
sound/soc/pxa/e740_wm9705.c	modified	+1	−0	View file
sound/soc/pxa/e750_wm9705.c	modified	+1	−0	View file
sound/soc/pxa/e800_wm9712.c	modified	+1	−0	View file
sound/soc/pxa/imote2.c	modified	+1	−0	View file
sound/soc/pxa/mioa701_wm9713.c	modified	+1	−0	View file
sound/soc/pxa/mmp-sspa.c	modified	+2	−3	View file
sound/soc/pxa/palm27x.c	modified	+1	−0	View file
sound/soc/pxa/poodle.c	modified	+1	−0	View file
sound/soc/pxa/pxa2xx-ac97.c	modified	+25	−31	View file
sound/soc/pxa/pxa2xx-i2s.c	modified	+2	−1	View file
sound/soc/pxa/tosa.c	modified	+1	−0	View file
sound/soc/pxa/ttc-dkb.c	modified	+1	−0	View file
sound/soc/s6000/s6000-pcm.c	modified	+2	−1	View file
sound/soc/samsung/bells.c	modified	+1	−0	View file
sound/soc/samsung/i2s.c	modified	+10	−15	View file
sound/soc/samsung/smdk_wm8994.c	modified	+3	−11	View file
sound/soc/sh/Kconfig	modified	+0	−1	View file
sound/soc/sh/rcar/adg.c	modified	+7	−4	View file
sound/soc/sh/rcar/core.c	modified	+24	−57	View file
sound/soc/sh/rcar/gen.c	modified	+165	−96	View file
sound/soc/sh/rcar/rsnd.h	modified	+1	−4	View file
sound/soc/sh/rcar/scu.c	modified	+11	−4	View file
sound/soc/sh/rcar/ssi.c	modified	+23	−32	View file
sound/soc/sh/siu_dai.c	modified	+2	−1	View file
sound/soc/soc-cache.c	modified	+65	−204	View file
sound/soc/soc-core.c	modified	+221	−155	View file
sound/soc/soc-dapm.c	modified	+86	−54	View file
sound/soc/soc-devres.c	added	+86	−0	View file
sound/soc/soc-generic-dmaengine-pcm.c	modified	+88	−19	View file
sound/soc/soc-io.c	modified	+0	−26	View file
sound/soc/soc-jack.c	modified	+6	−1	View file
sound/soc/soc-pcm.c	modified	+45	−26	View file
sound/soc/soc-utils.c	modified	+5	−1	View file
sound/soc/spear/spdif_in.c	modified	+2	−10	View file
sound/soc/spear/spdif_out.c	modified	+2	−12	View file
sound/soc/tegra/tegra20_i2s.c	modified	+3	−3	View file
sound/soc/tegra/tegra20_spdif.c	modified	+3	−3	View file
sound/soc/tegra/tegra30_ahub.c	modified	+103	−16	View file
sound/soc/tegra/tegra30_ahub.h	modified	+37	−1	View file
sound/soc/tegra/tegra30_i2s.c	modified	+40	−15	View file
sound/soc/tegra/tegra30_i2s.h	modified	+7	−0	View file
sound/soc/tegra/tegra_asoc_utils.c	modified	+2	−0	View file
sound/soc/tegra/tegra_asoc_utils.h	modified	+1	−0	View file
sound/soc/tegra/tegra_pcm.c	modified	+0	−1	View file
sound/soc/txx9/txx9aclc.c	modified	+6	−3	View file
sound/sparc/cs4231.c	modified	+4	−2	View file
sound/usb/6fire/chip.c	modified	+1	−1	View file
sound/usb/caiaq/control.c	modified	+92	−0	View file
sound/usb/caiaq/device.c	modified	+25	−0	View file
sound/usb/caiaq/device.h	modified	+5	−0	View file
sound/usb/card.c	modified	+2	−20	View file
sound/usb/card.h	modified	+8	−4	View file
sound/usb/endpoint.c	modified	+73	−66	View file
sound/usb/endpoint.h	modified	+3	−1	View file
sound/usb/helper.c	modified	+1	−0	View file
sound/usb/mixer.c	modified	+2	−2	View file
sound/usb/pcm.c	modified	+18	−22	View file
sound/usb/stream.c	modified	+21	−8	View file
sound/usb/usbaudio.h	modified	+0	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/sound/cs42l73.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/cs42l73.txt b/Documentation/devicetree/bindings/sound/cs42l73.txt
new file mode 100644
index 0000000..80ae910
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42l73.txt
@@ -0,0 +1,22 @@
+CS42L73 audio CODEC
+
+Required properties:
+
+  - compatible : "cirrus,cs42l73"
+
+  - reg : the I2C address of the device for I2C
+
+Optional properties:
+
+  - reset_gpio : a GPIO spec for the reset pin.
+  - chgfreq    : Charge Pump Frequency values 0x00-0x0F
+
+
+Example:
+
+codec: cs42l73@4a {
+	compatible = "cirrus,cs42l73";
+	reg = <0x4a>;
+	reset_gpio = <&gpio 10 0>;
+	chgfreq = <0x05>;
+};
\ No newline at end of file

Documentation/devicetree/bindings/sound/davinci-evm-audio.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
new file mode 100644
index 0000000..865178d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
@@ -0,0 +1,42 @@
+* Texas Instruments SoC audio setups with TLV320AIC3X Codec
+
+Required properties:
+- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx
+- ti,model : The user-visible name of this sound complex.
+- ti,audio-codec : The phandle of the TLV320AIC3x audio codec
+- ti,mcasp-controller : The phandle of the McASP controller
+- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec
+- ti,audio-routing : A list of the connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source. Valid names for sources and
+  sinks are the codec's pins, and the jacks on the board:
+
+  Board connectors:
+
+  * Headphone Jack
+  * Line Out
+  * Mic Jack
+  * Line In
+
+
+Example:
+
+sound {
+	compatible = "ti,da830-evm-audio";
+	ti,model = "DA830 EVM";
+	ti,audio-codec = <&tlv320aic3x>;
+	ti,mcasp-controller = <&mcasp1>;
+	ti,codec-clock-rate = <12000000>;
+	ti,audio-routing =
+		"Headphone Jack",       "HPLOUT",
+		"Headphone Jack",       "HPROUT",
+		"Line Out",             "LLOUT",
+		"Line Out",             "RLOUT",
+		"MIC3L",                "Mic Bias 2V",
+		"MIC3R",                "Mic Bias 2V",
+		"Mic Bias 2V",          "Mic Jack",
+		"LINE1L",               "Line In",
+		"LINE2L",               "Line In",
+		"LINE1R",               "Line In",
+		"LINE2R",               "Line In";
+};

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 374e145..ed785b3 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -4,17 +4,25 @@ Required properties:
 - compatible :
 	"ti,dm646x-mcasp-audio"	: for DM646x platforms
 	"ti,da830-mcasp-audio"	: for both DA830 & DA850 platforms
-	"ti,omap2-mcasp-audio"	: for OMAP2 platforms (TI81xx, AM33xx)
-
-- reg : Should contain McASP registers offset and length
-- interrupts : Interrupt number for McASP
-- op-mode : I2S/DIT ops mode.
-- tdm-slots : Slots for TDM operation.
-- num-serializer : Serializers used by McASP.
-- serial-dir : A list of serializer pin mode. The list number should be equal
-		to "num-serializer" parameter. Each entry is a number indication
-		serializer pin direction. (0 - INACTIVE, 1 - TX, 2 - RX)
+	"ti,am33xx-mcasp-audio"	: for AM33xx platforms (AM33xx, TI81xx)
 
+- reg : Should contain reg specifiers for the entries in the reg-names property.
+- reg-names : Should contain:
+         * "mpu" for the main registers (required). For compatibility with
+           existing software, it is recommended this is the first entry.
+         * "dat" for separate data port register access (optional).
+- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF,
+  	    IEC60958-1, and AES-3 formats.
+- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted
+  	      or received over one serializer.
+- serial-dir : A list of serializer configuration. Each entry is a number
+               indication for serializer pin direction.
+               (0 - INACTIVE, 1 - TX, 2 - RX)
+- dmas: two element list of DMA controller phandles and DMA request line
+        ordered pairs.
+- dma-names: identifier string for each DMA request line in the dmas property.
+	     These strings correspond 1:1 with the ordered pairs in dmas. The dma
+	     identifiers must be "rx" and "tx".
 
 Optional properties:
 
@@ -23,18 +31,23 @@ Optional properties:
 - rx-num-evt : FIFO levels.
 - sram-size-playback : size of sram to be allocated during playback
 - sram-size-capture  : size of sram to be allocated during capture
+- interrupts : Interrupt numbers for McASP, currently not used by the driver
+- interrupt-names : Known interrupt names are "tx" and "rx"
+- pinctrl-0: Should specify pin control group used for this controller.
+- pinctrl-names: Should contain only one value - "default", for more details
+  		 please refer to pinctrl-bindings.txt
+  
 
 Example:
 
 mcasp0: mcasp0@1d00000 {
 	compatible = "ti,da830-mcasp-audio";
-	#address-cells = <1>;
-	#size-cells = <0>;
 	reg = <0x100000 0x3000>;
-	interrupts = <82 83>;
+	reg-names "mpu";
+	interrupts = <82>, <83>;
+	interrupts-names = "tx", "rx";
 	op-mode = <0>;		/* MCASP_IIS_MODE */
 	tdm-slots = <2>;
-	num-serializer = <16>;
 	serial-dir = <
 			0 0 0 0	/* 0: INACTIVE, 1: TX, 2: RX */
 			0 0 0 0

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
index 705a6b1..5e6040c 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
@@ -24,10 +24,36 @@ Optional properties:
 	3 - MICBIAS output is connected to AVDD,
 	If this node is not mentioned or if the value is incorrect, then MicBias
 	is powered down.
+- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
+  device as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+CODEC output pins:
+  * LLOUT
+  * RLOUT
+  * MONO_LOUT
+  * HPLOUT
+  * HPROUT
+  * HPLCOM
+  * HPRCOM
+
+CODEC input pins:
+  * MIC3L
+  * MIC3R
+  * LINE1L
+  * LINE2L
+  * LINE1R
+  * LINE2R
+
+The pins can be used in referring sound node's audio-routing property.
 
 Example:
 
 tlv320aic3x: tlv320aic3x@1b {
 	compatible = "ti,tlv320aic3x";
 	reg = <0x1b>;
+
+	AVDD-supply = <&regulator>;
+	IOVDD-supply = <&regulator>;
+	DRVDD-supply = <&regulator>;
+	DVDD-supply = <&regulator>;
 };

Documentation/devicetree/bindings/sound/tpa6130a2.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tpa6130a2.txt b/Documentation/devicetree/bindings/sound/tpa6130a2.txt
new file mode 100644
index 0000000..6dfa740
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tpa6130a2.txt
@@ -0,0 +1,27 @@
+Texas Instruments - tpa6130a2 Codec module
+
+The tpa6130a2 serial control bus communicates through I2C protocols
+
+Required properties:
+
+- compatible - "string" - One of:
+    "ti,tpa6130a2" - TPA6130A2
+    "ti,tpa6140a2" - TPA6140A2
+
+
+- reg - <int> -  I2C slave address
+
+- Vdd-supply - <phandle> - power supply regulator
+
+Optional properties:
+
+- power-gpio - gpio pin to power the device
+
+Example:
+
+tpa6130a2: tpa6130a2@60 {
+	compatible = "ti,tpa6130a2";
+	reg = <0x60>;
+	Vdd-supply = <&vmmc2>;
+	power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
+};

Documentation/ioctl/ioctl-number.txt

View file

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 2a5f0e1..7cbfa3c 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -138,6 +138,7 @@ Code  Seq#(hex)	Include File		Comments
 'H'	C0-DF	net/bluetooth/cmtp/cmtp.h	conflict!
 'H'	C0-DF	net/bluetooth/bnep/bnep.h	conflict!
 'H'	F1	linux/hid-roccat.h	<mailto:[email protected]>
+'H'	F8-FA	sound/firewire.h
 'I'	all	linux/isdn.h		conflict!
 'I'	00-0F	drivers/isdn/divert/isdn_divert.h	conflict!
 'I'	40-4F	linux/mISDNif.h		conflict!

Documentation/laptops/thinkpad-acpi.txt

View file

diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 86c5236..fc04c14 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -1,7 +1,7 @@
 		     ThinkPad ACPI Extras Driver
 
-                            Version 0.24
-                        December 11th,  2009
+                            Version 0.25
+                        October 16th,  2013
 
                Borislav Deianov <[email protected]>
              Henrique de Moraes Holschuh <[email protected]>
@@ -741,6 +741,9 @@ compiled with the CONFIG_THINKPAD_ACPI_UNSAFE_LEDS option enabled.
 Distributions must never enable this option.  Individual users that
 are aware of the consequences are welcome to enabling it.
 
+Audio mute and microphone mute LEDs are supported, but currently not
+visible to userspace. They are used by the snd-hda-intel audio driver.
+
 procfs notes:
 
 The available commands are:

Documentation/sound/alsa/ALSA-Configuration.txt

View file

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 95731a0..b8dd0df 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -616,7 +616,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     As default, snd-dummy drivers doesn't allocate the real buffers
     but either ignores read/write or mmap a single dummy page to all
-    buffer pages, in order to save the resouces.  If your apps need
+    buffer pages, in order to save the resources.  If your apps need
     the read/ written buffer data to be consistent, pass fake_buffer=0
     option.
 

Documentation/sound/alsa/Audiophile-Usb.txt

View file

diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt
index 654dd3b..e7a5ed4 100644
--- a/Documentation/sound/alsa/Audiophile-Usb.txt
+++ b/Documentation/sound/alsa/Audiophile-Usb.txt
@@ -232,7 +232,7 @@ The parameter can be given:
    # modprobe snd-usb-audio index=1 device_setup=0x09
 
  * Or while configuring the modules options in your modules configuration file
-   (tipically a .conf file in /etc/modprobe.d/ directory:
+   (typically a .conf file in /etc/modprobe.d/ directory:
        alias snd-card-1 snd-usb-audio
        options snd-usb-audio index=1 device_setup=0x09
 

Documentation/sound/alsa/CMIPCI.txt

View file

diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 16935c8..4e36e6e 100644
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -87,7 +87,7 @@ with 4 channels,
 
 and use the interleaved 4 channel data.
 
-There are some control switchs affecting to the speaker connections:
+There are some control switches affecting to the speaker connections:
 
 "Line-In Mode"	- an enum control to change the behavior of line-in
 	jack.  Either "Line-In", "Rear Output" or "Bass Output" can

Documentation/sound/alsa/compress_offload.txt

View file

diff --git a/Documentation/sound/alsa/compress_offload.txt b/Documentation/sound/alsa/compress_offload.txt
index fd74ff2..630c492 100644
--- a/Documentation/sound/alsa/compress_offload.txt
+++ b/Documentation/sound/alsa/compress_offload.txt
@@ -217,12 +217,12 @@ Not supported:
   would be enabled with ALSA kcontrols.
 
 - Audio policy/resource management. This API does not provide any
-  hooks to query the utilization of the audio DSP, nor any premption
+  hooks to query the utilization of the audio DSP, nor any preemption
   mechanisms.
 
-- No notion of underun/overrun. Since the bytes written are compressed
+- No notion of underrun/overrun. Since the bytes written are compressed
   in nature and data written/read doesn't translate directly to
-  rendered output in time, this does not deal with underrun/overun and
+  rendered output in time, this does not deal with underrun/overrun and
   maybe dealt in user-library
 
 Credits:

Documentation/sound/alsa/soc/DPCM.txt

View file

diff --git a/Documentation/sound/alsa/soc/DPCM.txt b/Documentation/sound/alsa/soc/DPCM.txt
new file mode 100644
index 0000000..0110180
--- /dev/null
+++ b/Documentation/sound/alsa/soc/DPCM.txt
@@ -0,0 +1,380 @@
+Dynamic PCM
+===========
+
+1. Description
+==============
+
+Dynamic PCM allows an ALSA PCM device to digitally route its PCM audio to
+various digital endpoints during the PCM stream runtime. e.g. PCM0 can route
+digital audio to I2S DAI0, I2S DAI1 or PDM DAI2. This is useful for on SoC DSP
+drivers that expose several ALSA PCMs and can route to multiple DAIs.
+
+The DPCM runtime routing is determined by the ALSA mixer settings in the same
+way as the analog signal is routed in an ASoC codec driver. DPCM uses a DAPM
+graph representing the DSP internal audio paths and uses the mixer settings to
+determine the patch used by each ALSA PCM.
+
+DPCM re-uses all the existing component codec, platform and DAI drivers without
+any modifications.
+
+
+Phone Audio System with SoC based DSP
+-------------------------------------
+
+Consider the following phone audio subsystem. This will be used in this
+document for all examples :-
+
+| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+This diagram shows a simple smart phone audio subsystem. It supports Bluetooth,
+FM digital radio, Speakers, Headset Jack, digital microphones and cellular
+modem. This sound card exposes 4 DSP front end (FE) ALSA PCM devices and
+supports 6 back end (BE) DAIs. Each FE PCM can digitally route audio data to any
+of the BE DAIs. The FE PCM devices can also route audio to more than 1 BE DAI.
+
+
+
+Example - DPCM Switching playback from DAI0 to DAI1
+---------------------------------------------------
+
+Audio is being played to the Headset. After a while the user removes the headset
+and audio continues playing on the speakers.
+
+Playback on PCM0 to Headset would look like :-
+
+                    *************
+PCM0 <============> *           * <====DAI0=====> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+The headset is removed from the jack by user so the speakers must now be used :-
+
+                    *************
+PCM0 <============> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <====DAI1=====> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+The audio driver processes this as follows :-
+
+ 1) Machine driver receives Jack removal event.
+
+ 2) Machine driver OR audio HAL disables the Headset path.
+
+ 3) DPCM runs the PCM trigger(stop), hw_free(), shutdown() operations on DAI0
+    for headset since the path is now disabled.
+
+ 4) Machine driver or audio HAL enables the speaker path.
+
+ 5) DPCM runs the PCM ops for startup(), hw_params(), prepapre() and
+    trigger(start) for DAI1 Speakers since the path is enabled.
+
+In this example, the machine driver or userspace audio HAL can alter the routing
+and then DPCM will take care of managing the DAI PCM operations to either bring
+the link up or down. Audio playback does not stop during this transition.
+
+
+
+DPCM machine driver
+===================
+
+The DPCM enabled ASoC machine driver is similar to normal machine drivers
+except that we also have to :-
+
+ 1) Define the FE and BE DAI links.
+
+ 2) Define any FE/BE PCM operations.
+
+ 3) Define widget graph connections.
+
+
+1 FE and BE DAI links
+---------------------
+
+| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+For the example above we have to define 4 FE DAI links and 6 BE DAI links. The
+FE DAI links are defined as follows :-
+
+static struct snd_soc_dai_link machine_dais[] = {
+	{
+		.name = "PCM0 System",
+		.stream_name = "System Playback",
+		.cpu_dai_name = "System Pin",
+		.platform_name = "dsp-audio",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.dynamic = 1,
+		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dpcm_playback = 1,
+	},
+	.....< other FE and BE DAI links here >
+};
+
+This FE DAI link is pretty similar to a regular DAI link except that we also
+set the DAI link to a DPCM FE with the "dynamic = 1". The supported FE stream
+directions should also be set with the "dpcm_playback" and "dpcm_capture"
+flags. There is also an option to specify the ordering of the trigger call for
+each FE. This allows the ASoC core to trigger the DSP before or after the other
+components (as some DSPs have strong requirements for the ordering DAI/DSP
+start and stop sequences).
+
+The FE DAI above sets the codec and code DAIs to dummy devices since the BE is
+dynamic and will change depending on runtime config.
+
+The BE DAIs are configured as follows :-
+
+static struct snd_soc_dai_link machine_dais[] = {
+	.....< FE DAI links here >
+	{
+		.name = "Codec Headset",
+		.cpu_dai_name = "ssp-dai.0",
+		.platform_name = "snd-soc-dummy",
+		.no_pcm = 1,
+		.codec_name = "rt5640.0-001c",
+		.codec_dai_name = "rt5640-aif1",
+		.ignore_suspend = 1,
+		.ignore_pmdown_time = 1,
+		.be_hw_params_fixup = hswult_ssp0_fixup,
+		.ops = &haswell_ops,
+		.dpcm_playback = 1,
+		.dpcm_capture = 1,
+	},
+	.....< other BE DAI links here >
+};
+
+This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets
+the "no_pcm" flag to mark it has a BE and sets flags for supported stream
+directions using "dpcm_playback" and "dpcm_capture" above.
+
+The BE has also flags set for ignoring suspend and PM down time. This allows
+the BE to work in a hostless mode where the host CPU is not transferring data
+like a BT phone call :-
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <====DAI2=====> MODEM
+                    *           *
+PCM3 <------------> *           * <====DAI3=====> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+This allows the host CPU to sleep whilst the DSP, MODEM DAI and the BT DAI are
+still in operation.
+
+A BE DAI link can also set the codec to a dummy device if the code is a device
+that is managed externally.
+
+Likewise a BE DAI can also set a dummy cpu DAI if the CPU DAI is managed by the
+DSP firmware.
+
+
+2 FE/BE PCM operations
+----------------------
+
+The BE above also exports some PCM operations and a "fixup" callback. The fixup
+callback is used by the machine driver to (re)configure the DAI based upon the
+FE hw params. i.e. the DSP may perform SRC or ASRC from the FE to BE.
+
+e.g. DSP converts all FE hw params to run at fixed rate of 48k, 16bit, stereo for
+DAI0. This means all FE hw_params have to be fixed in the machine driver for
+DAI0 so that the DAI is running at desired configuration regardless of the FE
+configuration.
+
+static int dai0_fixup(struct snd_soc_pcm_runtime *rtd,
+			struct snd_pcm_hw_params *params)
+{
+	struct snd_interval *rate = hw_param_interval(params,
+			SNDRV_PCM_HW_PARAM_RATE);
+	struct snd_interval *channels = hw_param_interval(params,
+						SNDRV_PCM_HW_PARAM_CHANNELS);
+
+	/* The DSP will covert the FE rate to 48k, stereo */
+	rate->min = rate->max = 48000;
+	channels->min = channels->max = 2;
+
+	/* set DAI0 to 16 bit */
+	snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT -
+				    SNDRV_PCM_HW_PARAM_FIRST_MASK],
+				    SNDRV_PCM_FORMAT_S16_LE);
+	return 0;
+}
+
+The other PCM operation are the same as for regular DAI links. Use as necessary.
+
+
+3 Widget graph connections
+--------------------------
+
+The BE DAI links will normally be connected to the graph at initialisation time
+by the ASoC DAPM core. However, if the BE codec or BE DAI is a dummy then this
+has to be set explicitly in the driver :-
+
+/* BE for codec Headset -  DAI0 is dummy and managed by DSP FW */
+{"DAI0 CODEC IN", NULL, "AIF1 Capture"},
+{"AIF1 Playback", NULL, "DAI0 CODEC OUT"},
+
+
+Writing a DPCM DSP driver
+=========================
+
+The DPCM DSP driver looks much like a standard platform class ASoC driver
+combined with elements from a codec class driver. A DSP platform driver must
+implement :-
+
+ 1) Front End PCM DAIs - i.e. struct snd_soc_dai_driver.
+
+ 2) DAPM graph showing DSP audio routing from FE DAIs to BEs.
+
+ 3) DAPM widgets from DSP graph.