November 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] abdul, please add me to your LinkedIn network
by Divya S via LinkedIn 10 Nov '13

10 Nov '13

LinkedIn ------------ Divya S requested to add you as a connection on LinkedIn: ------------------------------------------ abdul, I'd like to add you to my professional network on LinkedIn. - Divya Accept invitation from Divya S http://www.linkedin.com/e/jpxkk3-hntomefz-3b/uii-rtptP1H4ViCg9YiBUOvto1r4_5… View profile of Divya S http://www.linkedin.com/e/jpxkk3-hntomefz-3b/rso/160331204/t2zH/name/138036… ------------------------------------------ You are receiving Invitation emails. This email was intended for abdul moiz. Learn why this is included: http://www.linkedin.com/e/jpxkk3-hntomefz-3b/plh/http%3A%2F%2Fhelp%2Elinked… (c) 2012, LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA.

1 0

[alsa-devel] ALSA device list:NULL problem
by anish singh 09 Nov '13

09 Nov '13

EPROBE_DEFER has come into picture and it delays the probe detection to complete until all the resources required for the device is detected. This however causes a minor problem which I am sure some people in this alsa devel mailing list would have noticed.If the probe keeps on deferring then we notice below kernel message: ALSA device list: No soundcards found. Is it deliberate or can I hack up some code to make it work?As obviously that message is there for a purpose.

1 0

[alsa-devel] [RFC/RFT v2 0/4] ALSA: hda - hdmi: ATI/AMD multi-channel and HBR support
by Anssi Hannula 08 Nov '13

08 Nov '13

Hi all! Here is a second revision of the ATI/AMD multichannel patch, now a patchset. Since the last revision from a bit over the week ago, AMD has released more documentation ( http://www.x.org/docs/AMD/AMD_HDA_verbs_v2.pdf ), so the patchset contains new additions: - HBR bitstreaming support (HD passthrough, for DTS-HD and Dolby TrueHD) o This completes the set, now we have HBR on NVIDIA, Intel and AMD :) - More complete ELD emulation on revision 3+ (0x100300) codecs o Untested, though from what I can see the newly added fields may not be filled in yet by the radeon driver. - Ramp up/down configuration according to non-pcm bit on rev3+ o I guess this means gradual fade-in/out? Untested. Other changes since the previous post: - ELD emulation moved to hda_eld.c and cleaned up a bit - Some fixes to hdmi_chmap_ctl_tlv() changes (and maybe something else I forgot - if so, sorry) Also, the pairwise channel mapping code has been tested to work with custom channel maps. The TLV contents are shown as follows by amixer: | chmap-paired=FL,FR | chmap-paired=FL,FR,NA,LFE | chmap-paired=FL,FR,FC,NA | chmap-paired=FL,FR,RL,RR | chmap-paired=FL,FR,FC,LFE | chmap-paired=FL,FR,NA,LFE,RL,RR | chmap-paired=FL,FR,FC,NA,RL,RR [etc] Rafał, do you know about the missing (AFAICS) support for lipsync (F7B) and sink information (F81) in radeon driver? This patchset requires at least more testing before it should be applied. A few other somewhat open things: - I named everything ati/ATI except for is_amdhdmi_rev3() and has_amd_full_remap_support() that are AMD-only, though AMD-only verbs I still named ATI to have similar names to other verbs. Does that seem sensible or how should this be done? - Currently setup_audio_infoframe() writes the channel mapping every time for ATI/AMD, should we try to avoid that? If so, any suggestions? (argh, just noticed this is broken for manual channel maps on non-ATI; if just the chmap is changed, channel mapping is not updated; so this requires fixes in the generic side as well) I'm especially interested in testers with: - Older codecs other than 0x1002aa01. My best guess still is that the new code works on them as well. o On these I'd like to know if multichannel and the new formats work, i.e. e.g. speaker-test -D hdmi:CARD=Generic,DEV=0 -c8 -r192000 -F S32_LE - Codec 0x1002aa01 revisions 0x100300 (Rev ID 3) or later (see /proc/asound/cardX/codec#Y). These are HD7750+ I think. Stuff to be tested on these: o The ramp up/down stuff, i.e. patch 4. Is there any difference seen with these, in the beginning/end (i.e. fade-out/in): speaker-test -D hdmi:CARD=Generic,DEV=0,AES0=0x04 -c2 -r48000 speaker-test -D hdmi:CARD=Generic,DEV=0,AES0=0x06 -c2 -r48000 Also, is there a difference in the beginning of these (maybe garbage sound and/or slightly slower startup?): aplay -Dhdmi:CARD=Generic,DEV=0,AES0=4 -r44100 -f s16_le -c2 testi.dts.cut.spdif aplay -Dhdmi:CARD=Generic,DEV=0,AES0=6 -r44100 -f s16_le -c2 testi.dts.cut.spdif o Contents of /proc/asound/cardX/eld#0. I'd like to see the contents both with radeon and with the proprietary fglrx driver in use Olivier, can you test again on your rev3 hw? :) The patchset can be found in combined form (for e.g. testing purposes) at: http://onse.fi/files/atihdmi5.patch The test file referenced above can be found at: http://onse.fi/files/testi.dts.cut.spdif.gz (just regular DTS) Anssi Hannula (4): ALSA: hda - hdmi: Add ATI/AMD multi-channel audio support ALSA: hda - hdmi: Add ELD emulation for ATI/AMD codecs ALSA: hda - hdmi: Add HBR bitstreaming support for ATI/AMD HDMI codecs ALSA: hda - hdmi: Disable ramp-up/down for non-PCM on AMD codecs sound/pci/hda/hda_eld.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/pci/hda/hda_local.h | 5 +++ sound/pci/hda/patch_hdmi.c | 424 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 547 insertions(+), 39 deletions(-) -- Anssi Hannula

4 29

[alsa-devel] [PATCH v5 0/4] Add dual-fifo mode support of i.MX ssi
by Nicolin Chen 08 Nov '13

08 Nov '13

* ! This series of patches has a direct dependency between them. When * ! applying them, we need to apply to one single branch. Otherwise, * ! it would break currect branches. Changelog v5: * PATCH-3: Add period size constraint when using dual fifo mode * * Nothing changes for the other three patches v4: * PATCH-3: Drop useless register configuration. * * Nothing changes for the other three patches v3: * PATCH-1: Add comments to indicate the end of v1 and v2 array. * PATCH-3: Use better way to keep watermark as even number. * * Nothing changes for PATCH-2 and PATCH-4 v2: * Instead of adding rogue scripts to current SDMA driver based on firmware * V1, we define the new SDMA firmware as version 2 and bisect the PATCH-1 * to two patches: The first is to add version check code to the SDMA driver; * And the second is to add SSI dual FIFO DMATYPE. * * Nothing changes for the last two patches. v1: * SSI can reduce hardware overrun/underrun possibility when using dual * fifo mode. To support this mode, we need to first update sdma sciprt * list, and then enable dual fifo BIT in SSI driver, and last update DT * bindings of i.MX series. Nicolin Chen (4): dma: imx-sdma: Add sdma firmware version 2 support dma: imx-sdma: Add new dma type for ssi dual fifo script ASoC: fsl_ssi: Add dual fifo mode support ARM: dts: imx: use dual-fifo sdma script for ssi .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + arch/arm/boot/dts/imx51.dtsi | 4 ++-- arch/arm/boot/dts/imx53.dtsi | 4 ++-- arch/arm/boot/dts/imx6qdl.dtsi | 12 +++++----- arch/arm/boot/dts/imx6sl.dtsi | 12 +++++----- drivers/dma/imx-sdma.c | 19 ++++++++++++++- include/linux/platform_data/dma-imx-sdma.h | 5 ++++ include/linux/platform_data/dma-imx.h | 1 + sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++- 9 files changed, 67 insertions(+), 18 deletions(-) -- 1.8.4

2 5

[alsa-devel] ASoC fixes for v3.13
by Mark Brown 08 Nov '13

08 Nov '13

The following changes since commit ae2ff9f6c529ba28adea906037a93fd14e46e052: ASoC: wm8962: Add EQ coefficient support (2013-11-01 10:52:17 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.13-fixes for you to fetch changes up to dd212bd5bb8b15889821ef79213cdb5bd47c6f85: Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next (2013-11-08 10:43:43 +0000) ---------------------------------------------------------------- ASoC: Updates for v3.13 Some additional fixes for v3.13, the majority of which are removals and downgrades of BUG()s from Takashi. ---------------------------------------------------------------- Alex Deucher (3): drm/radeon: use sw CTS/N values for audio on DCE4+ drm/radeon: disable bapm on KB drm/radeon/dpm: fix incompatible casting on big endian Andrey Moiseev (1): Input: i8042 - i8042_flush fix for a full 8042 buffer Arnaldo Carvalho de Melo (1): perf tools: Fix up /proc/PID/maps parsing Baruch Siach (1): xtensa: don't use alternate signal stack on threads Bastien Nocera (1): Input: wacom - export battery scope Chen LinX (1): mm/pagewalk.c: fix walk_page_range() access of wrong PTEs Dan Carpenter (7): uml: check length in exitcode_proc_write() staging: ozwpan: prevent overflow in oz_cdev_write() aacraid: missing capable() check in compat ioctl staging: wlags49_h2: buffer overflow setting station name Staging: bcm: info leak in ioctl Staging: sb105x: info leak in mp_get_count() ASoC: fsl: imx-wm8962: remove an unneeded check Daniel Vetter (1): drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb Dave Airlie (2): Merge tag 'drm-intel-fixes-2013-10-29' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes David Herrmann (2): Input: move name/timer init to input_alloc_dev() drm: allow DRM_IOCTL_VERSION on render-nodes Deng-Cheng Zhu (1): MIPS: Perf: Fix 74K cache map Dinh Nguyen (1): clk: socfpga: Fix incorrect sdmmc clock name Fabio Estevam (2): ASoC: fsl: fsl_spdif: No need to check the return value of platform_get_resource() ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable Greg KH (1): USB: Maintainers change for usb serial drivers Greg Kroah-Hartman (12): Revert "USB: pl2303: distinguish between original and cloned HX chips" Revert "pl2303: improve the chip type detection/distinction" Revert "pl2303: improve the chip type information output on startup" Revert "pl2303: simplify the else-if contruct for type_1 chips in pl2303_startup()" Revert "usb: pl2303: add two comments concerning the supported baud rates with HX chips" Revert "usb: pl2303: also use the divisor based baud rate encoding method for baud rates < 115200 with HX chips" Revert "usb: pl2303: increase the allowed baud rate range for the divisor based encoding method" Revert "usb: pl2303: move the two baud rate encoding methods to separate functions" Revert "usb: pl2303: remove 500000 baud from the list of standard baud rates" Revert "usb: pl2303: do not round to the next nearest standard baud rate for the divisor based baud rate encoding method" Revert "usb: pl2303: fix+improve the divsor based baud rate encoding method" Revert "USB: pl2303: restrict the divisor based baud rate encoding method to the "HX" chip type" Greg Thelen (3): percpu: fix this_cpu_sub() subtrahend casting for unsigneds memcg: use __this_cpu_sub() to dec stats to avoid incorrect subtrahend casting memcg: remove incorrect underflow check Ingo Molnar (2): Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/.../acme/linux into perf/urgent Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/.../acme/linux into perf/urgent James Bottomley (4): [SCSI] Revert "sg: push file descriptor list locking down to per-device locking" [SCSI] Revert "sg: checking sdp->detached isn't protected when open" [SCSI] Revert "sg: no need sg_open_exclusive_lock" [SCSI] Revert "sg: use rwsem to solve race during exclusive open" Jani Nikula (1): drm/i915/dp: workaround BIOS eDP bpp clamping issue Jason Gerecke (2): Input: wacom - add support for ISDv4 0x10F sensor Input: wacom - add support for ISDv4 0x10E sensor Jiri Olsa (3): perf hists: Add color overhead for stdio output buffer perf record: Split -g and --call-graph perf top: Split -G and --call-graph Johannes Weiner (3): mm: memcg: use proper memcg in limit bypass mm: memcg: lockdep annotation for memcg OOM lock mm: memcg: fix test for child groups Jonathan Austin (1): clk: fixup argument order when setting VCO parameters Joseph Schuchart (1): perf script python: Fix mem leak due to missing Py_DECREFs on dict entries Kuninori Morimoto (1): ASoC: rcar: remove un-needed select from Kconfig Lee Jones (1): ASoC: generic-dmaengine-pcm: Clear slave_config memory Linus Torvalds (23): Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'xtensa-next-20131015' of git://github.com/czankel/xtensa-linux Kconfig: make KOBJECT_RELEASE debugging require timer debugging Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Fix a few incorrectly checked [io_]remap_pfn_range() calls Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'sound-3.12' of git://git.kernel.org/.../tiwai/sound Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'tty-3.12-rc8' of git://git.kernel.org/.../gregkh/tty Merge branch 'akpm' (fixes from Andrew Morton) Merge tag 'pm+acpi-3.12-late' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip i915: fix compiler warning vfs: decrapify dput(), fix cache behavior under normal load Merge branch 'akpm' (fixes from Andrew Morton) Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux Merge tag 'sound-3.12' of git://git.kernel.org/.../tiwai/sound Merge tag 'usb-3.12-rc8' of git://git.kernel.org/.../gregkh/usb Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'fixes-for-linus' of git://git.kernel.org/.../rusty/linux Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Linux 3.12 Linus Walleij (1): clk: nomadik: set all timers to use 2.4 MHz TIMCLK Mark Brown (55): Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next Merge remote-tracking branch 'asoc/topic/component' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-next Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next Merge remote-tracking branch 'asoc/topic/devm' into asoc-next Merge remote-tracking branch 'asoc/topic/doc' into asoc-next Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next Merge remote-tracking branch 'asoc/topic/simple' into asoc-next Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next Merge remote-tracking branch 'asoc/topic/spear' into asoc-next Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next Merge remote-tracking branch 'asoc/topic/warn' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next Markos Chandras (1): MIPS: malta: Fix GIC interrupt offsets Mathias Krause (1): ipc, msg: forbid negative values for "msg{max,mnb,mni}" Max Filippov (1): xtensa: fix fast_syscall_spill_registers_fixup Mel Gorman (6): mm: numa: Do not account for a hinting fault if we raced mm: Wait for THP migrations to complete during NUMA hinting faults mm: Prevent parallel splits during THP migration mm: numa: Sanitize task_numa_fault() callsites mm: Close races between THP migration and PMD numa clearing mm: Account for a THP NUMA hinting update as one PTE update Mika Westerberg (1): Revert "ACPI / hotplug / PCI: Avoid doing too much for spurious notifies" Mike Dunn (1): Input: pxa27x_keypad - fix NULL pointer dereference Ming Lei (2): lib/scatterlist.c: don't flush_kernel_dcache_page on slab page scripts/kallsyms: filter symbols not in kernel address space Nariman Poushin (1): ASoC: wm_adsp: Interpret ADSP memory region lengths as 32 bit words Nicolas Ferre (1): tty/serial: at91: fix uart/usart selection for older products Nicolin Chen (1): ASoC: Add pinctrl PM to components of active DAIs Oskar Schirmer (1): ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation Paolo Bonzini (1): KVM: use a more sensible error number when debugfs directory creation fails Peter Zijlstra (2): perf: Fix perf ring buffer memory ordering perf/x86: Fix NMI measurements Rafael J. Wysocki (2): Revert "epoll: use freezable blocking call" Revert "select: use freezable blocking call" Rob Pearce (1): drm/i915: No LVDS hardware on Intel D410PT and D425KT Russell King (1): mm: list_lru: fix almost infinite loop causing effective livelock Simon Guinot (1): clk: armada-370: fix tclk frequencies Takashi Iwai (29): ASoC: blackfin: Use WARN_ON() instead of BUG_ON() ASoC: max98088: Use WARN_ON() instead of BUG_ON() ASoC: max98095: Use WARN_ON() instead of BUG_ON() ASoC: tpa6130a2: Use WARN_ON() instead of BUG_ON() ASoC: wm0010: Use WARN_ON() instead of BUG_ON() ASoC: wm2000: Use WARN_ON() instead of BUG_ON() ASoC: wm8580: Use WARN() instead of BUG_ON() ASoC: wm5100: Use WARN_ON() instead of BUG_ON() ASoC: wm8776: Use WARN_ON() instead of BUG_ON() ASoC: wm8900: Use WARN_ON() instead of BUG_ON() ASoC: wm8904: Use WARN_ON() instead of BUG_ON() ASoC: wm9713: Use WARN_ON() instead of BUG_ON() ASoC: mid-x86: Use WARN_ON() instead of BUG_ON() ASoC: omap: Use WARN_ON() instead of BUG_ON() ASoC: pxa: Use WARN_ON() instead of BUG_ON() ASoC: s6000: Use WARN_ON() instead of BUG_ON() ASoC: rcar: Use WARN_ON() instead of BUG_ON() ASoC: sh: Use WARN_ON() instead of BUG_ON() ASoC: txx9: Use WARN_ON() instead of BUG_ON() ASoC: wm8350: Replace BUG() with WARN() ASoC: wm8900: Replace BUG() with WARN() ASoC: wm8904: Replace BUG() with WARN() ASoC: wm8958: Replace BUG() with WARN() ASoC: wm8962: Replace BUG() with WARN() ASoC: wm8996: Replace BUG() with WARN() ASoC: wm_hubs: Replace BUG() with WARN() ASoC: Replace BUG() with WARN() ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages ASoC: dapm: Use WARN_ON() instead of BUG_ON() Thomas Meyer (1): xtensa: Cocci spatch "noderef" Tim Gardner (2): Input: cm109 - convert high volume dev_err() to dev_err_ratelimited() KVM: Fix modprobe failure for kvm_intel/kvm_amd Ville Syrjälä (2): drm/i915: Add support for pipe_bpp readout drm/i915: Add HSW CRT output readout support Vineet Gupta (1): ARC: Incorrect mm reference used in vmalloc fault handler Wei Yongjun (1): MIPS: ralink: fix return value check in rt_timer_probe() Yunkang Tang (1): Input: ALPS - add support for model found on Dell XT2 Zhouyi Zhou (1): perf tools: Fixup mmap event consumption Алексей Крамаренко (1): USB: serial: ftdi_sio: add id for Z3X Box device Documentation/ABI/stable/sysfs-bus-usb | 8 +- Documentation/ABI/testing/sysfs-devices-power | 32 +- Documentation/ABI/testing/sysfs-power | 22 +- Documentation/acpi/dsdt-override.txt | 2 +- Documentation/connector/ucon.c | 2 +- Documentation/devicetree/bindings/memory.txt | 168 ------ .../devicetree/bindings/sound/cs42l73.txt | 22 + .../bindings/sound/davinci-evm-audio.txt | 42 ++ .../bindings/sound/davinci-mcasp-audio.txt | 41 +- .../devicetree/bindings/sound/tlv320aic3x.txt | 26 + .../devicetree/bindings/sound/tpa6130a2.txt | 27 + Documentation/sound/alsa/soc/DPCM.txt | 380 +++++++++++++ Documentation/sound/alsa/soc/codec.txt | 46 +- Documentation/sound/alsa/soc/dapm.txt | 71 ++- Documentation/sound/alsa/soc/machine.txt | 6 +- Documentation/sound/alsa/soc/platform.txt | 19 +- MAINTAINERS | 171 +++--- Makefile | 2 +- arch/arc/mm/fault.c | 6 +- arch/arm/boot/dts/integratorcp.dts | 9 +- arch/arm/common/mcpm_entry.c | 6 +- arch/arm/common/sharpsl_param.c | 5 +- arch/arm/include/asm/Kbuild | 1 - arch/arm/include/asm/mcpm.h | 14 +- arch/arm/include/asm/syscall.h | 6 + arch/arm/kernel/head.S | 21 +- arch/arm/mm/dma-mapping.c | 43 +- arch/arm/mm/init.c | 3 - arch/arm/net/bpf_jit_32.c | 1 + arch/mips/kernel/perf_event_mipsxx.c | 4 +- arch/mips/mti-malta/malta-int.c | 9 +- arch/mips/ralink/timer.c | 2 +- arch/parisc/configs/712_defconfig | 2 + arch/parisc/configs/a500_defconfig | 2 + arch/parisc/configs/b180_defconfig | 3 + arch/parisc/configs/c3000_defconfig | 3 + arch/parisc/configs/c8000_defconfig | 2 + arch/parisc/configs/default_defconfig | 2 + arch/parisc/kernel/cache.c | 1 - arch/parisc/kernel/head.S | 4 + arch/powerpc/net/bpf_jit_comp.c | 1 + arch/s390/include/asm/pgtable.h | 4 +- arch/s390/include/asm/timex.h | 28 +- arch/s390/kernel/compat_signal.c | 4 +- arch/s390/kernel/debug.c | 2 +- arch/s390/kvm/interrupt.c | 6 +- arch/s390/lib/delay.c | 14 +- arch/s390/net/bpf_jit_comp.c | 4 +- arch/sparc/net/bpf_jit_comp.c | 1 + arch/um/kernel/exitcode.c | 4 +- arch/x86/Kconfig | 1 + arch/x86/include/asm/percpu.h | 3 +- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- arch/x86/kernel/cpu/perf_event.c | 6 +- arch/x86/kernel/kvm.c | 19 +- arch/x86/kernel/nmi.c | 4 +- arch/x86/net/bpf_jit_comp.c | 18 +- arch/x86/xen/smp.c | 9 + arch/xtensa/kernel/entry.S | 49 +- arch/xtensa/kernel/signal.c | 2 +- arch/xtensa/platforms/iss/network.c | 3 +- block/partitions/efi.c | 7 +- drivers/acpi/Kconfig | 8 +- drivers/acpi/device_pm.c | 56 -- drivers/acpi/power.c | 104 +--- drivers/acpi/scan.c | 1 - drivers/ata/ahci.c | 2 +- drivers/ata/ahci_platform.c | 2 +- drivers/ata/libahci.c | 10 +- drivers/ata/libata-acpi.c | 14 - drivers/ata/libata-eh.c | 6 +- drivers/ata/libata-scsi.c | 3 - drivers/ata/libata.h | 4 - drivers/ata/pata_isapnp.c | 2 +- drivers/base/memory.c | 7 +- drivers/base/regmap/internal.h | 3 + drivers/base/regmap/regmap.c | 103 ++++ drivers/char/tpm/xen-tpmfront.c | 1 + drivers/clk/clk-nomadik.c | 21 + drivers/clk/mvebu/armada-370.c | 4 +- drivers/clk/socfpga/clk.c | 2 +- drivers/clk/versatile/clk-icst.c | 2 +- drivers/connector/cn_proc.c | 18 + drivers/connector/connector.c | 9 +- drivers/cpufreq/acpi-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 52 +- drivers/cpufreq/s3c64xx-cpufreq.c | 2 +- drivers/dma/edma.c | 2 + drivers/gpio/gpio-lynxpoint.c | 5 +- drivers/gpio/gpiolib.c | 6 +- drivers/gpu/drm/drm_drv.c | 11 +- drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 109 +++- drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/intel_crt.c | 28 +- drivers/gpu/drm/i915/intel_ddi.c | 21 +- drivers/gpu/drm/i915/intel_display.c | 131 +++-- drivers/gpu/drm/i915/intel_dp.c | 20 + drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_lvds.c | 16 + drivers/gpu/drm/i915/intel_pm.c | 4 +- drivers/gpu/drm/radeon/atombios_encoders.c | 54 +- drivers/gpu/drm/radeon/cik.c | 4 + drivers/gpu/drm/radeon/dce6_afmt.c | 3 + drivers/gpu/drm/radeon/evergreen_hdmi.c | 4 + drivers/gpu/drm/radeon/kv_dpm.c | 2 +- drivers/gpu/drm/radeon/ni.c | 1 + drivers/gpu/drm/radeon/r600.c | 1 + drivers/gpu/drm/radeon/r600_hdmi.c | 3 + drivers/gpu/drm/radeon/radeon.h | 4 +- drivers/gpu/drm/radeon/radeon_connectors.c | 33 +- drivers/gpu/drm/radeon/radeon_cs.c | 3 +- drivers/gpu/drm/radeon/radeon_drv.c | 4 +- drivers/gpu/drm/radeon/radeon_uvd.c | 3 +- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- drivers/hid/hid-core.c | 12 +- drivers/hid/hid-ids.h | 6 + drivers/hid/hid-input.c | 13 +- drivers/hid/hid-wiimote-core.c | 5 +- drivers/hid/usbhid/hid-quirks.c | 3 + drivers/iio/frequency/adf4350.c | 6 +- drivers/iio/industrialio-buffer.c | 3 + drivers/infiniband/Kconfig | 11 + drivers/infiniband/core/uverbs.h | 2 + drivers/infiniband/core/uverbs_cmd.c | 4 + drivers/infiniband/core/uverbs_main.c | 6 + drivers/infiniband/hw/amso1100/c2_ae.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 2 + drivers/infiniband/hw/mlx5/main.c | 16 +- drivers/infiniband/hw/mlx5/mr.c | 70 ++- drivers/infiniband/hw/mlx5/qp.c | 80 +-- drivers/infiniband/hw/mlx5/srq.c | 4 +- drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 6 +- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 +- drivers/infiniband/ulp/isert/ib_isert.c | 2 +- drivers/input/input.c | 10 +- drivers/input/keyboard/pxa27x_keypad.c | 11 +- drivers/input/misc/cm109.c | 14 +- drivers/input/mouse/alps.c | 1 + drivers/input/serio/i8042.c | 23 +- drivers/input/tablet/wacom_sys.c | 4 + drivers/input/tablet/wacom_wac.c | 8 + drivers/md/bcache/request.c | 2 +- drivers/md/dm-snap-persistent.c | 18 +- drivers/md/md.c | 5 +- drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + drivers/md/raid5.c | 20 + drivers/media/dvb-frontends/tda10071.c | 9 +- drivers/media/i2c/ad9389b.c | 15 +- drivers/media/i2c/adv7511.c | 18 +- drivers/media/i2c/adv7842.c | 30 +- drivers/media/i2c/ths8200.c | 12 +- drivers/media/pci/saa7134/saa7134-video.c | 1 + drivers/media/platform/s5p-jpeg/jpeg-core.c | 1 + drivers/media/platform/sh_vou.c | 2 +- drivers/media/platform/soc_camera/mx3_camera.c | 5 +- drivers/media/tuners/e4000.c | 3 +- drivers/media/usb/stkwebcam/stk-webcam.c | 7 + drivers/media/usb/uvc/uvc_driver.c | 18 + drivers/media/v4l2-core/videobuf2-core.c | 4 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 87 ++- drivers/mfd/mc13xxx-core.c | 5 - drivers/mfd/mc13xxx-spi.c | 5 + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/pxa3xx_nand.c | 7 +- drivers/net/can/at91_can.c | 4 +- drivers/net/can/dev.c | 10 +- drivers/net/can/flexcan.c | 14 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 15 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 40 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 38 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 388 +++++++------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 29 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- drivers/net/ethernet/calxeda/xgmac.c | 23 +- drivers/net/ethernet/davicom/dm9000.c | 56 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 3 +- drivers/net/ethernet/freescale/gianfar.c | 38 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 + drivers/net/ethernet/marvell/mv643xx_eth.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 41 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 28 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 21 +- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 16 +- drivers/net/ethernet/moxa/moxart_ether.c | 22 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 13 +- drivers/net/ethernet/renesas/sh_eth.c | 4 + drivers/net/ethernet/sfc/ef10.c | 87 ++- drivers/net/ethernet/sfc/mcdi.c | 18 +- drivers/net/ethernet/sfc/mcdi_pcol.h | 56 +- drivers/net/ethernet/sfc/nic.c | 9 +- drivers/net/ethernet/sfc/nic.h | 12 + drivers/net/ethernet/smsc/smc91x.h | 6 +- drivers/net/ethernet/ti/cpsw.c | 19 +- drivers/net/ethernet/ti/davinci_emac.c | 3 +- drivers/net/hamradio/yam.c | 1 - drivers/net/ieee802154/mrf24j40.c | 31 +- drivers/net/tun.c | 8 +- drivers/net/usb/ax88179_178a.c | 23 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 4 +- drivers/net/virtio_net.c | 14 +- drivers/net/wan/farsync.c | 1 + drivers/net/wan/wanxl.c | 1 + drivers/net/wireless/ath/ath9k/main.c | 23 +- drivers/net/wireless/ath/ath9k/xmit.c | 9 +- drivers/net/wireless/cw1200/cw1200_spi.c | 2 + drivers/net/wireless/iwlwifi/iwl-6000.c | 6 + drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-trans.h | 6 +- drivers/net/wireless/iwlwifi/mvm/power.c | 5 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 12 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 42 ++ drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 2 + drivers/net/wireless/mwifiex/join.c | 10 +- drivers/net/wireless/mwifiex/main.c | 6 +- drivers/net/wireless/mwifiex/sta_event.c | 3 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 3 +- drivers/net/xen-netback/xenbus.c | 4 + drivers/of/Kconfig | 6 - drivers/of/Makefile | 1 - drivers/of/base.c | 4 +- drivers/of/fdt.c | 12 - drivers/of/of_reserved_mem.c | 173 ------ drivers/of/platform.c | 4 - drivers/pci/hotplug/acpiphp_glue.c | 14 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/sony-laptop.c | 26 +- drivers/s390/block/dasd_eckd.c | 98 +++- drivers/s390/char/sclp.c | 4 +- drivers/s390/char/vmlogrdr.c | 2 +- drivers/s390/cio/cio.c | 4 +- drivers/s390/cio/qdio_main.c | 10 +- drivers/scsi/BusLogic.c | 16 +- drivers/scsi/aacraid/linit.c | 2 + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 9 + drivers/scsi/sd.c | 2 +- drivers/scsi/sg.c | 176 +++--- drivers/staging/bcm/Bcmchar.c | 1 + drivers/staging/media/msi3101/Kconfig | 1 + drivers/staging/media/msi3101/sdr-msi3101.c | 10 +- drivers/staging/ozwpan/ozcdev.c | 3 + drivers/staging/sb105x/sb_pci_mp.c | 2 +- drivers/staging/wlags49_h2/wl_priv.c | 9 +- drivers/target/target_core_pscsi.c | 8 +- drivers/target/target_core_sbc.c | 5 + drivers/target/target_core_xcopy.c | 53 +- drivers/thermal/samsung/exynos_thermal_common.c | 2 - drivers/thermal/samsung/exynos_tmu.c | 12 +- drivers/thermal/samsung/exynos_tmu.h | 7 +- drivers/thermal/samsung/exynos_tmu_data.c | 30 +- drivers/thermal/samsung/exynos_tmu_data.h | 13 +- drivers/thermal/thermal_hwmon.c | 2 +- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 1 + drivers/thermal/x86_pkg_temp_thermal.c | 14 +- drivers/tty/serial/atmel_serial.c | 9 +- drivers/tty/serial/imx.c | 3 - drivers/tty/serial/vt8500_serial.c | 5 +- drivers/uio/uio.c | 17 +- drivers/usb/chipidea/host.c | 6 +- drivers/usb/core/quirks.c | 6 + drivers/usb/host/pci-quirks.c | 4 +- drivers/usb/host/xhci-hub.c | 26 - drivers/usb/host/xhci-pci.c | 25 + drivers/usb/host/xhci.c | 14 +- drivers/usb/host/xhci.h | 2 + drivers/usb/misc/Kconfig | 2 +- drivers/usb/musb/musb_core.c | 46 ++ drivers/usb/musb/musb_core.h | 1 + drivers/usb/musb/musb_gadget.c | 3 + drivers/usb/musb/musb_virthub.c | 46 -- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 225 +++++++- drivers/usb/serial/pl2303.c | 274 ++------- drivers/usb/serial/ti_usb_3410_5052.c | 1 + drivers/usb/storage/scsiglue.c | 5 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/vfio/vfio_iommu_type1.c | 40 +- drivers/vhost/scsi.c | 2 +- drivers/video/au1100fb.c | 26 +- drivers/video/au1200fb.c | 23 +- drivers/w1/w1.c | 6 + fs/btrfs/inode.c | 1 + fs/buffer.c | 14 +- fs/cifs/cifsfs.c | 6 +- fs/cifs/cifspdu.h | 31 +- fs/cifs/cifssmb.c | 40 +- fs/cifs/netmisc.c | 4 +- fs/cifs/sess.c | 4 +- fs/cifs/smb2pdu.c | 6 + fs/cifs/smbfsctl.h | 14 + fs/cifs/transport.c | 9 +- fs/dcache.c | 20 +- fs/ecryptfs/crypto.c | 2 +- fs/ecryptfs/keystore.c | 3 +- fs/eventpoll.c | 4 +- fs/ext3/namei.c | 5 +- fs/ext4/namei.c | 5 +- fs/file_table.c | 4 +- fs/jfs/jfs_inode.c | 3 +- fs/namei.c | 3 +- fs/proc/inode.c | 10 +- fs/proc/task_mmu.c | 4 +- fs/select.c | 3 +- fs/seq_file.c | 2 + include/acpi/acpi_bus.h | 7 - include/linux/filter.h | 15 +- include/linux/ipc_namespace.h | 6 +- include/linux/memcontrol.h | 50 +- include/linux/mfd/mc13xxx.h | 7 + include/linux/mlx5/device.h | 4 +- include/linux/mlx5/driver.h | 6 +- include/linux/netdevice.h | 5 +- include/linux/of_reserved_mem.h | 14 - include/linux/percpu.h | 8 +- include/linux/platform_data/davinci_asp.h | 2 + include/linux/regmap.h | 13 + include/linux/sched.h | 7 +- include/linux/usb/usb_phy_gen_xceiv.h | 2 +- include/linux/usb_usual.h | 4 +- include/linux/yam.h | 2 +- include/net/cipso_ipv4.h | 6 +- include/net/dst.h | 12 + include/net/ip6_route.h | 6 +- include/net/mac802154.h | 2 +- include/net/sock.h | 6 +- include/sound/cs42l52.h | 2 + include/sound/cs42l73.h | 22 + include/sound/dmaengine_pcm.h | 8 + include/sound/rcar_snd.h | 2 +- include/sound/soc-dai.h | 17 + include/sound/soc-dapm.h | 4 + include/sound/soc.h | 100 ++-- include/trace/events/asoc.h | 1 + include/trace/events/target.h | 4 +- include/uapi/drm/drm_mode.h | 2 + include/uapi/linux/perf_event.h | 12 +- include/uapi/linux/tc_act/Kbuild | 1 + include/{ => uapi}/linux/tc_act/tc_defact.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 6 + ipc/ipc_sysctl.c | 20 +- ipc/sem.c | 42 +- ipc/util.c | 27 +- kernel/cgroup.c | 14 +- kernel/events/core.c | 4 + kernel/events/ring_buffer.c | 31 +- kernel/mutex.c | 32 +- kernel/power/hibernate.c | 2 +- kernel/time/clockevents.c | 65 ++- lib/Kconfig.debug | 2 +- lib/percpu-refcount.c | 3 + lib/scatterlist.c | 3 +- mm/filemap.c | 11 +- mm/huge_memory.c | 80 ++- mm/hugetlb.c | 17 +- mm/list_lru.c | 3 +- mm/memcontrol.c | 196 +++---- mm/memory.c | 73 ++- mm/migrate.c | 21 +- mm/mprotect.c | 9 +- mm/mremap.c | 5 +- mm/oom_kill.c | 2 +- mm/page-writeback.c | 10 +- mm/pagewalk.c | 2 +- mm/slab_common.c | 2 + mm/swapfile.c | 4 +- mm/vmscan.c | 1 + mm/zswap.c | 4 + net/8021q/vlan_netlink.c | 2 +- net/batman-adv/main.c | 5 +- net/batman-adv/network-coding.c | 28 +- net/batman-adv/network-coding.h | 14 +- net/bridge/br_fdb.c | 4 +- net/bridge/br_mdb.c | 2 +- net/bridge/br_multicast.c | 38 +- net/bridge/br_netlink.c | 2 +- net/bridge/br_private.h | 5 +- net/bridge/br_stp_if.c | 2 +- net/bridge/br_vlan.c | 125 ++-- net/compat.c | 2 + net/core/dev.c | 3 +- net/core/filter.c | 8 +- net/core/secure_seq.c | 2 + net/core/sock.c | 1 + net/ieee802154/6lowpan.c | 5 + net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ip_output.c | 13 +- net/ipv4/ip_vti.c | 14 +- net/ipv4/route.c | 2 +- net/ipv4/tcp_input.c | 9 +- net/ipv4/tcp_output.c | 14 +- net/ipv4/xfrm4_policy.c | 1 + net/ipv6/ah6.c | 3 +- net/ipv6/esp6.c | 3 +- net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/ip6_gre.c | 6 +- net/ipv6/ip6_output.c | 29 +- net/ipv6/ip6_tunnel.c | 12 +- net/ipv6/ipcomp6.c | 3 +- net/ipv6/route.c | 46 +- net/ipv6/udp.c | 5 +- net/ipv6/xfrm6_policy.c | 1 + net/key/af_key.c | 3 +- net/l2tp/l2tp_core.c | 36 +- net/l2tp/l2tp_core.h | 3 + net/l2tp/l2tp_ppp.c | 4 + net/mac80211/cfg.c | 2 +- net/mac80211/ieee80211_i.h | 3 + net/mac80211/offchannel.c | 2 + net/mac80211/rx.c | 3 + net/mac80211/scan.c | 19 + net/mac80211/status.c | 3 + net/mac80211/tx.c | 3 +- net/mac80211/util.c | 9 +- net/netfilter/nf_conntrack_h323_main.c | 4 +- net/sched/sch_fq.c | 22 +- net/sched/sch_netem.c | 17 + net/sctp/output.c | 3 +- net/socket.c | 24 +- net/unix/af_unix.c | 10 + net/unix/diag.c | 1 + net/wireless/core.c | 23 +- net/wireless/core.h | 3 + net/wireless/ibss.c | 3 + net/wireless/nl80211.c | 4 +- net/wireless/radiotap.c | 7 +- net/xfrm/xfrm_policy.c | 28 +- net/xfrm/xfrm_replay.c | 54 +- net/xfrm/xfrm_user.c | 5 +- scripts/kallsyms.c | 12 +- scripts/link-vmlinux.sh | 2 + security/apparmor/apparmorfs.c | 4 +- security/apparmor/policy.c | 1 + sound/arm/pxa2xx-ac97-lib.c | 27 +- sound/core/pcm.c | 4 + sound/pci/hda/hda_codec.c | 4 +- sound/pci/hda/hda_generic.c | 6 +- sound/pci/hda/patch_analog.c | 18 +- sound/pci/hda/patch_realtek.c | 1 + sound/pci/rme9652/hdsp.c | 1 + sound/soc/Makefile | 2 +- sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/atmel/atmel_wm8904.c | 8 - sound/soc/atmel/sam9g20_wm8731.c | 1 + sound/soc/blackfin/bf5xx-sport.c | 32 +- sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-pcm.c | 13 + sound/soc/codecs/88pm860x-codec.c | 75 +-- sound/soc/codecs/88pm860x-codec.h | 117 ++-- sound/soc/codecs/ab8500-codec.c | 92 ++- sound/soc/codecs/adau1373.c | 298 ++++++++-- sound/soc/codecs/adav80x.c | 147 +++-- sound/soc/codecs/ak4104.c | 11 +- sound/soc/codecs/ak4642.c | 4 +- sound/soc/codecs/arizona.c | 23 +- sound/soc/codecs/cq93vc.c | 46 +- sound/soc/codecs/cs4271.c | 1 + sound/soc/codecs/cs42l52.c | 93 +-- sound/soc/codecs/cs42l52.h | 2 +- sound/soc/codecs/cs42l73.c | 114 ++-- sound/soc/codecs/cs42l73.h | 105 ++-- sound/soc/codecs/max98088.c | 632 +++++++++------------ sound/soc/codecs/max98095.c | 482 ++++++---------- sound/soc/codecs/max9850.c | 39 +- sound/soc/codecs/mc13783.c | 135 +++-- sound/soc/codecs/ml26124.c | 2 + sound/soc/codecs/pcm1681.c | 3 +- sound/soc/codecs/pcm1792a.c | 3 +- sound/soc/codecs/rt5640.c | 31 +- sound/soc/codecs/si476x.c | 64 +-- sound/soc/codecs/sn95031.c | 35 +- sound/soc/codecs/tas5086.c | 171 ++++-- sound/soc/codecs/tlv320aic23.c | 84 ++- sound/soc/codecs/tlv320aic26.c | 139 +---- sound/soc/codecs/tlv320aic26.h | 5 +- sound/soc/codecs/tlv320aic32x4.c | 101 +--- sound/soc/codecs/tlv320aic3x.c | 238 ++++---- sound/soc/codecs/tpa6130a2.c | 53 +- sound/soc/codecs/twl4030.c | 80 ++- sound/soc/codecs/twl6040.c | 26 +- sound/soc/codecs/wm0010.c | 11 +- sound/soc/codecs/wm2000.c | 15 +- sound/soc/codecs/wm5100.c | 3 +- sound/soc/codecs/wm5110.c | 12 + sound/soc/codecs/wm8350.c | 2 +- sound/soc/codecs/wm8400.c | 95 +--- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8776.c | 3 +- sound/soc/codecs/wm8900.c | 11 +- sound/soc/codecs/wm8904.c | 5 +- sound/soc/codecs/wm8958-dsp2.c | 2 +- sound/soc/codecs/wm8962.c | 10 +- sound/soc/codecs/wm8996.c | 14 +- sound/soc/codecs/wm9713.c | 3 +- sound/soc/codecs/wm_adsp.c | 49 +- sound/soc/codecs/wm_hubs.c | 3 +- sound/soc/davinci/Kconfig | 18 +- sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 188 +++++- sound/soc/davinci/davinci-mcasp.c | 169 ++++-- sound/soc/davinci/davinci-mcasp.h | 12 + sound/soc/fsl/eukrea-tlv320.c | 15 +- sound/soc/fsl/fsl_spdif.c | 23 +- sound/soc/fsl/fsl_ssi.c | 22 +- sound/soc/fsl/imx-audmux.c | 9 +- sound/soc/fsl/imx-mc13783.c | 3 +- sound/soc/fsl/imx-pcm-dma.c | 4 +- sound/soc/fsl/imx-pcm-fiq.c | 22 +- sound/soc/fsl/imx-sgtl5000.c | 4 +- sound/soc/fsl/imx-spdif.c | 4 +- sound/soc/fsl/imx-ssi.c | 26 +- sound/soc/fsl/imx-ssi.h | 2 + sound/soc/fsl/imx-wm8962.c | 7 +- sound/soc/generic/simple-card.c | 5 + sound/soc/kirkwood/kirkwood-dma.c | 6 +- sound/soc/kirkwood/kirkwood-i2s.c | 108 +++- sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 2 +- sound/soc/kirkwood/kirkwood.h | 4 +- sound/soc/mid-x86/mfld_machine.c | 10 +- sound/soc/mid-x86/sst_platform.c | 6 +- sound/soc/mxs/mxs-saif.c | 42 +- sound/soc/mxs/mxs-saif.h | 5 + sound/soc/mxs/mxs-sgtl5000.c | 20 +- sound/soc/omap/Kconfig | 4 +- sound/soc/omap/n810.c | 7 +- sound/soc/omap/omap-mcpdm.c | 12 +- sound/soc/omap/omap-twl4030.c | 5 +- sound/soc/pxa/brownstone.c | 1 + sound/soc/pxa/corgi.c | 1 + sound/soc/pxa/e740_wm9705.c | 1 + sound/soc/pxa/e750_wm9705.c | 1 + sound/soc/pxa/e800_wm9712.c | 1 + sound/soc/pxa/imote2.c | 1 + sound/soc/pxa/mioa701_wm9713.c | 1 + sound/soc/pxa/mmp-sspa.c | 5 +- sound/soc/pxa/palm27x.c | 1 + sound/soc/pxa/poodle.c | 1 + sound/soc/pxa/pxa2xx-ac97.c | 56 +- sound/soc/pxa/pxa2xx-i2s.c | 3 +- sound/soc/pxa/tosa.c | 1 + sound/soc/pxa/ttc-dkb.c | 1 + sound/soc/s6000/s6000-pcm.c | 3 +- sound/soc/samsung/bells.c | 1 + sound/soc/samsung/i2s.c | 25 +- sound/soc/samsung/smdk_wm8994.c | 14 +- sound/soc/sh/Kconfig | 1 - sound/soc/sh/rcar/adg.c | 11 +- sound/soc/sh/rcar/core.c | 81 +-- sound/soc/sh/rcar/gen.c | 261 +++++---- sound/soc/sh/rcar/rsnd.h | 9 +- sound/soc/sh/rcar/scu.c | 15 +- sound/soc/sh/rcar/ssi.c | 55 +- sound/soc/sh/siu_dai.c | 3 +- sound/soc/soc-cache.c | 269 +++------ sound/soc/soc-core.c | 376 +++++++----- sound/soc/soc-dapm.c | 70 ++- sound/soc/soc-devres.c | 86 +++ sound/soc/soc-generic-dmaengine-pcm.c | 105 +++- sound/soc/soc-io.c | 26 - sound/soc/soc-pcm.c | 71 ++- sound/soc/soc-utils.c | 6 +- sound/soc/spear/spdif_in.c | 12 +- sound/soc/spear/spdif_out.c | 14 +- sound/soc/tegra/tegra30_ahub.c | 115 +++- sound/soc/tegra/tegra30_ahub.h | 38 +- sound/soc/tegra/tegra30_i2s.c | 51 +- sound/soc/tegra/tegra30_i2s.h | 7 + sound/soc/tegra/tegra_asoc_utils.c | 2 + sound/soc/tegra/tegra_asoc_utils.h | 1 + sound/soc/tegra/tegra_pcm.c | 1 - sound/soc/txx9/txx9aclc.c | 9 +- sound/usb/usx2y/us122l.c | 4 +- tools/perf/Documentation/perf-record.txt | 14 +- tools/perf/Documentation/perf-top.txt | 18 +- tools/perf/builtin-kvm.c | 7 + tools/perf/builtin-record.c | 73 ++- tools/perf/builtin-top.c | 33 +- tools/perf/builtin-trace.c | 8 +- tools/perf/tests/code-reading.c | 1 + tools/perf/tests/keep-tracking.c | 1 + tools/perf/tests/mmap-basic.c | 1 + tools/perf/tests/open-syscall-tp-fields.c | 4 +- tools/perf/tests/perf-record.c | 2 + tools/perf/tests/perf-time-to-tsc.c | 4 +- tools/perf/tests/sw-clock.c | 4 +- tools/perf/tests/task-exit.c | 6 +- tools/perf/ui/stdio/hist.c | 9 +- tools/perf/util/callchain.h | 3 + tools/perf/util/event.c | 32 +- tools/perf/util/evlist.c | 13 +- tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 1 - tools/perf/util/hist.h | 13 + tools/perf/util/probe-finder.c | 2 +- tools/perf/util/python.c | 2 + .../perf/util/scripting-engines/trace-event-perl.c | 2 +- .../util/scripting-engines/trace-event-python.c | 37 +- tools/testing/selftests/timers/posix_timers.c | 2 +- virt/kvm/kvm_main.c | 2 +- 616 files changed, 8410 insertions(+), 6103 deletions(-) delete mode 100644 Documentation/devicetree/bindings/memory.txt create mode 100644 Documentation/devicetree/bindings/sound/cs42l73.txt create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/tpa6130a2.txt create mode 100644 Documentation/sound/alsa/soc/DPCM.txt delete mode 100644 drivers/of/of_reserved_mem.c delete mode 100644 include/linux/of_reserved_mem.h create mode 100644 include/sound/cs42l73.h rename include/{ => uapi}/linux/tc_act/tc_defact.h (75%) create mode 100644 sound/soc/soc-devres.c

1 0

[alsa-devel] [PATCH] ASoC: wm8974: Convert to direct regmap API usage
by Mark Brown 08 Nov '13

08 Nov '13

From: Mark Brown <broonie(a)linaro.org> Moves us towards removing the ASoC level I/O functions. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/wm8974.c | 54 +++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index a2d01d1..15f45c7 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -17,6 +17,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -27,22 +28,22 @@ #include "wm8974.h" -static const u16 wm8974_reg[WM8974_CACHEREGNUM] = { - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0050, 0x0000, 0x0140, 0x0000, - 0x0000, 0x0000, 0x0000, 0x00ff, - 0x0000, 0x0000, 0x0100, 0x00ff, - 0x0000, 0x0000, 0x012c, 0x002c, - 0x002c, 0x002c, 0x002c, 0x0000, - 0x0032, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0038, 0x000b, 0x0032, 0x0000, - 0x0008, 0x000c, 0x0093, 0x00e9, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0003, 0x0010, 0x0000, 0x0000, - 0x0000, 0x0002, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0039, 0x0000, - 0x0000, +static const struct reg_default wm8974_reg_defaults[] = { + { 0, 0x0000 }, { 1, 0x0000 }, { 2, 0x0000 }, { 3, 0x0000 }, + { 4, 0x0050 }, { 5, 0x0000 }, { 6, 0x0140 }, { 7, 0x0000 }, + { 8, 0x0000 }, { 9, 0x0000 }, { 10, 0x0000 }, { 11, 0x00ff }, + { 12, 0x0000 }, { 13, 0x0000 }, { 14, 0x0100 }, { 15, 0x00ff }, + { 16, 0x0000 }, { 17, 0x0000 }, { 18, 0x012c }, { 19, 0x002c }, + { 20, 0x002c }, { 21, 0x002c }, { 22, 0x002c }, { 23, 0x0000 }, + { 24, 0x0032 }, { 25, 0x0000 }, { 26, 0x0000 }, { 27, 0x0000 }, + { 28, 0x0000 }, { 29, 0x0000 }, { 30, 0x0000 }, { 31, 0x0000 }, + { 32, 0x0038 }, { 33, 0x000b }, { 34, 0x0032 }, { 35, 0x0000 }, + { 36, 0x0008 }, { 37, 0x000c }, { 38, 0x0093 }, { 39, 0x00e9 }, + { 40, 0x0000 }, { 41, 0x0000 }, { 42, 0x0000 }, { 43, 0x0000 }, + { 44, 0x0003 }, { 45, 0x0010 }, { 46, 0x0000 }, { 47, 0x0000 }, + { 48, 0x0000 }, { 49, 0x0002 }, { 50, 0x0000 }, { 51, 0x0000 }, + { 52, 0x0000 }, { 53, 0x0000 }, { 54, 0x0039 }, { 55, 0x0000 }, + { 56, 0x0000 }, }; #define WM8974_POWER1_BIASEN 0x08 @@ -514,7 +515,7 @@ static int wm8974_set_bias_level(struct snd_soc_codec *codec, power1 |= WM8974_POWER1_BIASEN | WM8974_POWER1_BUFIOEN; if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { - snd_soc_cache_sync(codec); + regcache_sync(dev_get_regmap(codec->dev, NULL)); /* Initial cap charge at VMID 5k */ snd_soc_write(codec, WM8974_POWER1, power1 | 0x3); @@ -579,11 +580,20 @@ static int wm8974_resume(struct snd_soc_codec *codec) return 0; } +static const struct regmap_config wm8974_regmap = { + .reg_bits = 7, + .val_bits = 9, + + .max_register = WM8974_MONOMIX, + .reg_defaults = wm8974_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm8974_reg_defaults), +}; + static int wm8974_probe(struct snd_soc_codec *codec) { int ret = 0; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C); + ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); return ret; @@ -613,9 +623,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { .suspend = wm8974_suspend, .resume = wm8974_resume, .set_bias_level = wm8974_set_bias_level, - .reg_cache_size = ARRAY_SIZE(wm8974_reg), - .reg_word_size = sizeof(u16), - .reg_cache_default = wm8974_reg, .controls = wm8974_snd_controls, .num_controls = ARRAY_SIZE(wm8974_snd_controls), @@ -628,8 +635,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { static int wm8974_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { + struct regmap *regmap; int ret; + regmap = devm_regmap_init_i2c(i2c, &wm8974_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8974, &wm8974_dai, 1); -- 1.8.4.2

2 1

[alsa-devel] [PATCH 2/2] alsa-utils: pcmjob.c: use portable way to initialize recursive mutex
by John Spencer 08 Nov '13

08 Nov '13

attaching the patch, as i currently have problems with git-send-email. thanks, --JS From faed06fd4a3b97ee7f4b46c60e3a828e47845d0e Mon Sep 17 00:00:00 2001 From: John Spencer <maillist-alsa(a)barfooze.de> Date: Fri, 8 Nov 2013 13:59:41 +0100 Subject: [PATCH] pcmjob.c: use portable way to initialize recursive mutex PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not in POSIX, as _NP (non-portable) suggests. exposing such a symbol in musl libc would lock in the ABI for all times and makes it impossible to do future changes to the under- lying struct without hideous symbol versioning hacks. use the portable way instead: pthread_once was designed for such cases. Signed-off-by: John Spencer <maillist-alsa(a)barfooze.de> Tested-by: John Spencer <maillist-alsa(a)barfooze.de> --- alsaloop/pcmjob.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c index 139b6fd..f32180c 100644 --- a/alsaloop/pcmjob.c +++ b/alsaloop/pcmjob.c @@ -62,11 +62,22 @@ static const char *src_types[] = { }; #endif -static pthread_mutex_t pcm_open_mutex = - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; +static pthread_once_t pcm_open_mutex_once = PTHREAD_ONCE_INIT; +static pthread_mutex_t pcm_open_mutex; + +static void pcm_open_init_mutex(void) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&pcm_open_mutex, &attr); + pthread_mutexattr_destroy(&attr); +} static inline void pcm_open_lock(void) { + pthread_once(&pcm_open_mutex_once, pcm_open_init_mutex); if (workarounds & WORKAROUND_SERIALOPEN) pthread_mutex_lock(&pcm_open_mutex); } -- 1.8.4

2 1

[alsa-devel] [PATCH 1/2] alsa-lib: conf.c: use portable way to initialize recursive mutex
by John Spencer 08 Nov '13

08 Nov '13

attaching the patch, as i currently have problems with git-send-email, and it would force me to use the wrong author name. got the OK from Timo on IRC to send his patch. thanks, --JS From dc28b1183af73e205d835414cacc9d9dfdf8af02 Mon Sep 17 00:00:00 2001 From: Timo Teräs <timo.teras(a)iki.fi> Date: Fri, 8 Nov 2013 13:17:58 +0100 Subject: [PATCH] conf.c: use portable way to initialize recursive mutex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not in POSIX, as _NP (non-portable) suggests. exposing such a symbol in musl libc would lock in the ABI for all times and makes it impossible to do future changes to the under- lying struct without hideous symbol versioning hacks. use the portable way instead: pthread_once was designed for such cases. Signed-off-by: Timo Teräs <timo.teras(a)iki.fi> Tested-by: John Spencer <maillist-alsa(a)barfooze.de> --- src/conf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/conf.c b/src/conf.c index bfed1c4..5ccc8e1 100644 --- a/src/conf.c +++ b/src/conf.c @@ -427,8 +427,8 @@ beginning:</P> #ifndef DOC_HIDDEN #ifdef HAVE_LIBPTHREAD -static pthread_mutex_t snd_config_update_mutex = - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; +static pthread_mutex_t snd_config_update_mutex; +static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT; #endif struct _snd_config { @@ -472,8 +472,19 @@ typedef struct { #ifdef HAVE_LIBPTHREAD +static void snd_config_init_mutex(void) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&snd_config_update_mutex, &attr); + pthread_mutexattr_destroy(&attr); +} + static inline void snd_config_lock(void) { + pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex); pthread_mutex_lock(&snd_config_update_mutex); } -- 1.8.4

2 1

[alsa-devel] [PATCH] ALSA: hda - Add multifunction jack support for ALC255
by David Henningsson 08 Nov '13

08 Nov '13

From: Kailang Yang <kailang(a)realtek.com> The new codec ALC255 needs its own set of verbs to enable multifunction jacks. (Context and whitespace adjustments by David Henningsson) BugLink: https://bugs.launchpad.net/bugs/1248949 Tested-by: Doro Wu <doro.wu(a)canonical.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index daf7205..ceadd65 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -588,6 +588,18 @@ static int alc_read_coef_idx(struct hda_codec *codec, return val; } +static int alc_read_coefex_idx(struct hda_codec *codec, + hda_nid_t nid, + unsigned int coef_idx) +{ + unsigned int val; + snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, + coef_idx); + val = snd_hda_codec_read(codec, nid, 0, + AC_VERB_GET_PROC_COEF, 0); + return val; +} + static void alc_write_coef_idx(struct hda_codec *codec, unsigned int coef_idx, unsigned int coef_val) { @@ -597,6 +609,15 @@ static void alc_write_coef_idx(struct hda_codec *codec, unsigned int coef_idx, coef_val); } +static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid, + unsigned int coef_idx, unsigned int coef_val) +{ + snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, + coef_idx); + snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PROC_COEF, + coef_val); +} + /* a special bypass for COEF 0; read the cached value at the second time */ static unsigned int alc_get_coef0(struct hda_codec *codec) { @@ -3109,6 +3130,14 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) int val; switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x1b, 0x0c0b); + alc_write_coef_idx(codec, 0x45, 0xd089); + val = alc_read_coefex_idx(codec, 0x57, 0x05); + alc_write_coefex_idx(codec, 0x57, 0x05, val & ~(1<<14)); + alc_write_coef_idx(codec, 0x06, 0x6104); + alc_write_coefex_idx(codec, 0x57, 0x03, 0x8aa6); + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x1b, 0x0c0b); alc_write_coef_idx(codec, 0x45, 0xc429); @@ -3140,6 +3169,13 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, int val; switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x45, 0xc489); + snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); + alc_write_coefex_idx(codec, 0x57, 0x03, 0x8aa6); + alc_write_coef_idx(codec, 0x06, 0x6100); + snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50); + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x45, 0xc429); snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); @@ -3171,6 +3207,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, static void alc_headset_mode_default(struct hda_codec *codec) { switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x45, 0xc089); + alc_write_coef_idx(codec, 0x45, 0xc489); + alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6); + alc_write_coef_idx(codec, 0x49, 0x0049); + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x06, 0x2100); alc_write_coef_idx(codec, 0x32, 0x4ea3); @@ -3194,6 +3236,11 @@ static void alc_headset_mode_default(struct hda_codec *codec) static void alc_headset_mode_ctia(struct hda_codec *codec) { switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x45, 0xd489); + alc_write_coef_idx(codec, 0x1b, 0x0c2b); + alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6); + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x45, 0xd429); alc_write_coef_idx(codec, 0x1b, 0x0c2b); @@ -3216,6 +3263,11 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) static void alc_headset_mode_omtp(struct hda_codec *codec) { switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x45, 0xe489); + alc_write_coef_idx(codec, 0x1b, 0x0c2b); + alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6); + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x45, 0xe429); alc_write_coef_idx(codec, 0x1b, 0x0c2b); @@ -3241,6 +3293,13 @@ static void alc_determine_headset_type(struct hda_codec *codec) struct alc_spec *spec = codec->spec; switch (codec->vendor_id) { + case 0x10ec0255: + alc_write_coef_idx(codec, 0x45, 0xd089); + alc_write_coef_idx(codec, 0x49, 0x0149); + msleep(300); + val = alc_read_coef_idx(codec, 0x46); + is_ctia = (val & 0x0070) == 0x0070; + break; case 0x10ec0283: alc_write_coef_idx(codec, 0x45, 0xd029); msleep(300); @@ -3387,6 +3446,20 @@ static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec, alc_fixup_headset_mode(codec, fix, action); } +static void alc_fixup_headset_mode_alc255(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action == HDA_FIXUP_ACT_PRE_PROBE) { + alc_write_coef_idx(codec, 0x1b, 0x880b); + alc_write_coef_idx(codec, 0x45, 0xd089); + alc_write_coef_idx(codec, 0x1b, 0x080b); + alc_write_coef_idx(codec, 0x46, 0x0004); + alc_write_coef_idx(codec, 0x1b, 0x0c0b); + msleep(30); + } + alc_fixup_headset_mode(codec, fix, action); +} + static void alc_fixup_headset_mode_alc668(struct hda_codec *codec, const struct hda_fixup *fix, int action) { @@ -3686,6 +3759,8 @@ enum { ALC283_FIXUP_INT_MIC, ALC290_FIXUP_MONO_SPEAKERS, ALC269_FIXUP_THINKPAD_ACPI, + ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, + ALC255_FIXUP_HEADSET_MODE, }; static const struct hda_fixup alc269_fixups[] = { @@ -3995,6 +4070,20 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST }, + [ALC255_FIXUP_DELL1_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */ + { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC255_FIXUP_HEADSET_MODE + }, + [ALC255_FIXUP_HEADSET_MODE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_headset_mode_alc255, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -4037,6 +4126,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_MONO_SPEAKERS), + SND_PCI_QUIRK(0x1028, 0x061f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), -- 1.7.9.5

3 7

[alsa-devel] [PATCH] ALSA: hda - Apply MacBook fixups for CS4208 correctly
by Takashi Iwai 08 Nov '13

08 Nov '13

The commit [8fe7b65ab465: ALSA: hda - Apply GPIO setup for MacBooks with CS4208] added a fixup entry matching with the vendor id 0x106b. This broke the fixups for previous MBA6,1 and 6,2, since the PCI SSID vendor id matches before evaluating the codec SSIDs. We had a similar issue on Mac with Sigmatel codecs, and solve this problem again similarly, by introducing a skeleton entry matching with the all MacBooks, then remap to the right one. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64401 Fixes: 8fe7b65ab465 ('ALSA: hda - Apply GPIO setup for MacBooks with CS4208') Cc: <stable(a)vger.kernel.org> [v3.12+] Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_cirrus.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 1ce1f4067b15..072755c8289c 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -597,6 +597,7 @@ static int patch_cs420x(struct hda_codec *codec) * Its layout is no longer compatible with CS4206/CS4207 */ enum { + CS4208_MAC_AUTO, CS4208_MBA6, CS4208_GPIO0, }; @@ -608,10 +609,14 @@ static const struct hda_model_fixup cs4208_models[] = { }; static const struct snd_pci_quirk cs4208_fixup_tbl[] = { - /* codec SSID */ + SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS4208_MAC_AUTO), + {} /* terminator */ +}; + +/* codec SSID matching */ +static const struct snd_pci_quirk cs4208_mac_fixup_tbl[] = { SND_PCI_QUIRK(0x106b, 0x7100, "MacBookAir 6,1", CS4208_MBA6), SND_PCI_QUIRK(0x106b, 0x7200, "MacBookAir 6,2", CS4208_MBA6), - SND_PCI_QUIRK_VENDOR(0x106b, "Apple", CS4208_GPIO0), {} /* terminator */ }; @@ -627,6 +632,20 @@ static void cs4208_fixup_gpio0(struct hda_codec *codec, } } +static const struct hda_fixup cs4208_fixups[]; + +/* remap the fixup from codec SSID and apply it */ +static void cs4208_fixup_mac(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + snd_hda_pick_fixup(codec, NULL, cs4208_mac_fixup_tbl, cs4208_fixups); + if (codec->fixup_id < 0 || codec->fixup_id == CS4208_MAC_AUTO) + codec->fixup_id = CS4208_GPIO0; /* default fixup */ + snd_hda_apply_fixup(codec, action); +} + static const struct hda_fixup cs4208_fixups[] = { [CS4208_MBA6] = { .type = HDA_FIXUP_PINS, @@ -638,6 +657,10 @@ static const struct hda_fixup cs4208_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cs4208_fixup_gpio0, }, + [CS4208_MAC_AUTO] = { + .type = HDA_FIXUP_FUNC, + .v.func = cs4208_fixup_mac, + }, }; /* correct the 0dB offset of input pins */ -- 1.8.4.2

1 0