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

[alsa-devel] [PATCH 1/2] ASoC: fsl: Add wrapping for dev_dbg() in fsl_spdif.c
by Nicolin Chen 31 Aug '13

31 Aug '13

Add wrapping '\n' for dev_dbg() in fsl_spdif.c Signed-off-by: Nicolin Chen <b42378(a)freescale.com> --- sound/soc/fsl/fsl_spdif.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index e93dc0d..98741e9 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1071,9 +1071,9 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, break; } - dev_dbg(&pdev->dev, "use rxtx%d as tx clock source for %dHz sample rate", + dev_dbg(&pdev->dev, "use rxtx%d as tx clock source for %dHz sample rate\n", spdif_priv->txclk_src[index], rate[index]); - dev_dbg(&pdev->dev, "use divisor %d for %dHz sample rate", + dev_dbg(&pdev->dev, "use divisor %d for %dHz sample rate\n", spdif_priv->txclk_div[index], rate[index]); return 0; -- 1.7.1

2 2

[alsa-devel] [PATCH RFC 00/13] Adding SPDIF support to kirkwood-i2s
by Russell King - ARM Linux 30 Aug '13

30 Aug '13

This is only a RFC at present due to the need to test on Kirkwood and fix at least one bug in ASoC core code. I can't say that this stuff is fully tested, because I don't have any Kirkwood platforms, but I do have one Dove platform, which as I've said in the past doesn't run mainline. I don't run DT on it, so these patches also don't contain anything DT related. However, this patch set is aimed at sorting out the SPDIF on Dove and Kirkwood, which the Dove-based Cubox uses. The first patch in the series I've already sent, and I think Mark may have already picked up. The second is my implementation of what I think Mark committed to use the devm_* APIs for the external clock. Patches 3 and 4 fix problems which I've found with the ASoC core code, which prevent these patches from working correctly. Patch 3 I've already discussed with Mark over the weekend, and I think that's pretty much settled, but patch 4 is a definite hack. Patch 4 addresses an issue where we end up registering the CPU DAIs stream widgets twice - once against the codec DAPM context and again against the platform DAPM context. When these are registered, pointers to these widgets are saved into the CPU DAI structure, so one set of these widgets gets overwritten by the other set. The set which wins (normally the ones in the CPU DAPM context) ends up being the set which are made active. However, the platform ones remain on the DAI list, and these can end up being bound to by routes. ASoC people need to fix this problem as a pre-requisit to the following patches working. Patches 5 and 6 are just cleanups - I decided it was easier to do my own version of merging the I2S and DMA files rather than using Jean-F's patch (sorry, I just wanted something that worked...) Patch 7 is based on some changes in Rabeeh's kernel - I will have a following patch at some point to adjust these parameters to something a little saner. This just gets mainline closer to the tree which I can test. Patch 8 adds the I2S widgets to kirkwood-i2s and uses them. With this patch applied, kirkwood-i2s will be silent unless at least one of the output widgets is "powered up" - in the case of this patch, that's the "i2sdo" widget - naming following what's in the functional spec. Patch 9 and 10 add the DAPM routes to connect the I2S inputs/outputs to the codec streams, restoring audio output on these platforms. As I don't have these platforms, this should be tested by someone who has. Patch 11, again, discussed with Mark, this adds an always enabled output pin for the SPDIF transceiver, so that the output is powered up by DAPM. Without this, the SPDIF output stream goes into "active" mode during playback, but is never powered up. This results in any connected source widgets also not being powered up. Patch 12 adds the SPDIF output widget to kirkwood-i2s, called "spdifdo", again a name derived from the functional spec. The actual pin is called "AU_SPDIFDO". Patch 13 adds the IEC958 channel status data to patch 12, allowing the channel status to be set by applications using an appropriate ALSA library configuration file via the standard methods. What I haven't included is the board file (like the openrd and t5325 ones already present) for SPDIF support on Dove, as that's based on the pre-DT setups, and I'm not sure anyone in mainline is interested in that. So the above provides the components necessary, hopefully someone with ASoC & DT knowledge can bind these components together via appropriate DT bindings. For reference, the DAI link looks like this: .name = "S/PDIF1", .stream_name = "IEC958 Playback", .platform_name = "mvebu-audio.1", .cpu_dai_name = "mvebu-audio.1", .codec_dai_name = "dit-hifi", .codec_name = "spdif-dit", and the required route: static const struct snd_soc_dapm_route routes[] = { { "Playback", NULL, "spdifdo" }, };

11 71

[alsa-devel] [GIT PULL] ASoC updates for v3.12
by Mark Brown 30 Aug '13

30 Aug '13

The following changes since commit 1c9a341bbdc14051a4d8c74ea67269786c7d3736: ALSA: hda - Simplify CONFIG_SND_HDA_I915 condition (2013-08-27 14:49:59 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.12-2 for you to fetch changes up to 6d52825fd4e78b251f4844f6662a3bc4e31671c7: Merge remote-tracking branch 'asoc/topic/wm8904' into tmp (2013-08-30 11:04:35 +0100) The diffstat is large as this includes a merge up of v3.11-rc7. ---------------------------------------------------------------- ASoC: Updates for v3.12 A few more updates for v3.12, mostly small cleanups plus the addition of the DT bindings for kirkwood and the new i.MX S/PDIF driver. ---------------------------------------------------------------- Aaro Koskinen (1): ARM: OMAP: rx51: change musb mode to OTG Al Viro (1): cope with potentially long ->d_dname() output for shmem/hugetlb Alan Stern (1): USB: OHCI: add missing PCI PM callbacks to ohci-pci.c Alex Deucher (1): drm/radeon/r7xx: fix copy paste typo in golden register setup Alexey Khoroshilov (1): via-ircc: don't return zero if via_ircc_open() failed Anatolij Gustschin (1): usb: phy: fix build breakage Andrey Vagin (1): tcp: set timestamps for restored skb-s Anthony Foiani (1): sata_fsl: save irqs while coalescing Anton Blanchard (1): [SCSI] lpfc: Don't force CONFIG_GENERIC_CSUM on Ariel Elior (2): bnx2x: Protect against VFs' ndos when SR-IOV is disabled bnx2x: set VF DMAE when first function has 0 supported VFs Baruch Siach (1): sched_clock: Fix integer overflow Ben Hutchings (1): sfc: Fix lookup of default RX MAC filters when steered using ethtool Ben Skeggs (2): drm/nouveau/mc: fix race condition between constructor and request_irq() drm/nv04/disp: fix framebuffer pin refcounting Benjamin Marzinski (1): GFS2: don't overrun reserved revokes Benoit Cousson (1): MAINTAINERS: Update email address for Benoit Cousson Boris BREZILLON (1): ARM: at91: add missing uart clocks DT entries Chen Gang (1): arm64: KVM: use 'int' instead of 'u32' for variable 'target' in kvm_host.h. Chris Wilson (2): drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code drm/i915: Invalidate TLBs for the rings after a reset Christian König (1): drm/radeon: fix UVD message buffer validation Christoffer Dall (3): ARM: KVM: Fix 64-bit coprocessor handling ARM: KVM: Fix unaligned unmap_range leak KVM: ARM: Squash len warning Chuck Anderson (1): xen/smp: initialize IPI vectors before marking CPU online Dan Carpenter (6): Hostap: copying wrong data prism2_ioctl_giwaplist() nl80211: nl80211hdr_put() doesn't return an ERR_PTR GFS2: alloc_workqueue() doesn't return an ERR_PTR efs: iget_locked() doesn't return an ERR_PTR() bfs: iget_locked() doesn't return an ERR_PTR VFS: collect_mounts() should return an ERR_PTR Daniel Drake (2): x86: Don't clear olpc_ofw_header when sentinel is detected drivers/platform/olpc/olpc-ec.c: initialise earlier Daniel Gimpelevich (2): hso: Earlier catch of error condition hso: Fix stack corruption on some architectures Daniel Mack (1): ARM: OMAP2: fix musb usage for n8x0 Daniel Serpell (1): sony-laptop: Fix reporting of gfx_switch_status Daniel Vetter (1): drm/i915: unpin backing storage in dmabuf_unmap Dave Airlie (4): Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Merge tag 'drm-intel-fixes-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes David Daney (1): MIPS: Handle OCTEON BBIT instructions in FPU emulator. David S. Miller (3): Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'sfc-3.11' of git://git.kernel.org/.../bwh/sfc David Vrabel (3): x86/xen: do not identity map UNUSABLE regions in the machine E820 xen/events: initialize local per-cpu mask for all possible events xen/events: mask events when changing their VCPU binding Dmitry Kravkov (3): bnx2x: dropless flow control not always functional bnx2x: Change DCB context handling bnx2x: Consider DCBX remote error Duan Jiong (1): ipv6: handle Redirect ICMP Message with no Redirected Header option Emmanuel Grumbach (1): iwlwifi: pcie: disable L1 Active after pci_enable_device Fabio Estevam (8): ARM: 7819/1: fiq: Cast the first argument of flush_icache_range() ASoC: simple-card: Provide owner and MODULE_ALIAS() ASoC: fsl_spdif: Remove unnecessary dev_set_drvdata() ASoC: fsl_spdif: Reduce the noise on comments ASoC: fsl_ssi: Remove unnecessary dev_set_drvdata() ASoC: designware_i2s: Remove unnecessary dev_set_drvdata() ASoC: ep93xx-i2s: Remove unnecessary dev_set_drvdata() ASoC: fsl: Drop SND_SOC_FSL_UTILS from SND_SOC_IMX_SPDIF Geert Uytterhoeven (1): dm cache: avoid conflicting remove_mapping() in mq policy Giuseppe CAVALLARO (1): net: phy: rtl8211: fix interrupt on status link change Greg Kroah-Hartman (1): Merge tag 'iio-fixes-for-3.11c' of git://git.kernel.org/.../jic23/iio into staging-linus Guillaume Clement (1): gma500: Fix SDVO turning off randomly Guy Cohen (1): Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG" Hannes Frederic Sowa (2): ipv6: remove max_addresses check from ipv6_create_tempaddr ipv6: drop packets with multiple fragmentation headers Ian Abbott (1): staging: comedi: bug-fix NULL pointer dereference on failed attach Ilia Mirkin (1): drm/nouveau/fb: fix null derefs in nv49 and nv4e init Ingo Molnar (3): Merge branch 'timers/urgent' of git://git.kernel.org/.../frederic/linux-dynticks into timers/urgent Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into timers/urgent Merge tag 'amd_ucode_fixes' of git://git.kernel.org/.../bp/bp into x86/urgent Jean-Francois Moine (2): ASoc: kirkwood: add DT support to the mvebu audio subsystem ASoc: kirkwood: Use the Kirkwood audio driver in Dove boards Joern Rennecke (1): ARC: [lib] strchr breakage in Big-endian configuration Johannes Berg (3): iwlwifi: mvm: disconnect if time event scheduling fails cfg80211: don't request disconnect if not connected Revert "genetlink: fix family dump race" John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Julien Grall (1): xen/arm: missing put_cpu in xen_percpu_init Jussi Kivilinna (1): zd1201: do not use stack as URB transfer_buffer Kukjin Kim (1): ARM: SAMSUNG: fix to support for missing cpu specific map_io Kuninori Morimoto (1): ASoC: fsi: reserve prefetch period on DMA transferring Lars-Peter Clausen (8): ASoC: dmic: Convert table based DAPM setup ASoC: dapm: Fix marking widgets dirty when a route is added ASoC: tlv320aic32x4: Convert table based control and DAPM setup ASoC: wm8904: Remove unnecessary call to snd_soc_dapm_new_widgets() ASoC: jack: Remove unnecessary call to snd_soc_dapm_new_widgets() ASoC: Call snd_soc_dapm_new_widgets() only once during card initialization ASoC: Move call to snd_soc_dapm_new_widgets() after snd_soc_dapm_auto_nc_codec_pins() ASoC: Pass card instead of dapm context to snd_soc_dapm_new_widgets() Li Zefan (1): cpuset: fix a regression in validating config change Li Zhong (1): nohz: fix compile warning in tick_nohz_init() Linus Lüssing (1): batman-adv: check return type of unicast packet preparations Linus Torvalds (27): Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge git://git.kernel.org/.../steve/gfs2-3.0-fixes proc: more readdir conversion bug-fixes Merge tag 'pinctrl-for-v3.11-3' of git://git.kernel.org/.../linusw/linux-pinctrl Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'arm64-stable' of git://git.kernel.org/.../cmarinas/linux-aarch64 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus Merge tag 'stable/for-linus-3.11-rc6-tag' of git://git.kernel.org/.../xen/tip Revert "x86 get_unmapped_area(): use proper mmap base for bottom-up direction" Merge tag 'dm-3.11-fixes' of git://git.kernel.org/.../device-mapper/linux-dm Merge tag 'devicetree-fixes-for-3.11' of git://sources.calxeda.com/kernel/linux Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 Merge branch 'akpm' (patches from Andrew Morton) Merge git://git.kernel.org/.../davem/net Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge branch 'for-3.11-fixes' of git://git.kernel.org/.../tj/cgroup Merge branch 'for-3.11-fixes' of git://git.kernel.org/.../tj/libata Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'acpi-3.11-rc7' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Merge tag 'usb-3.11-rc7' of git://git.kernel.org/.../gregkh/usb Merge tag 'staging-3.11-rc7' of git://git.kernel.org/.../gregkh/staging Linux 3.11-rc7 Maarten Lankhorst (2): drm/nouveau/ltcg: fix ltcg memory initialization after suspend drm/nouveau/ltcg: fix allocating memory as free Marc Zyngier (3): arm64: KVM: fix 2-level page tables unmapping arm64: KVM: perform save/restore of PAR_EL1 arm64: KVM: add missing dsb before invalidating Stage-2 TLBs Mark Brown (11): Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-core Merge remote-tracking branch 'asoc/topic/dapm' into asoc-core Merge remote-tracking branch 'asoc/topic/core' into tmp Merge remote-tracking branch 'asoc/topic/designware' into tmp Merge remote-tracking branch 'asoc/topic/ep93xx' into tmp Merge remote-tracking branch 'asoc/topic/fsi' into tmp Merge remote-tracking branch 'asoc/topic/fsl' into tmp Merge remote-tracking branch 'asoc/topic/kirkwood' into tmp Merge remote-tracking branch 'asoc/topic/samsung' into tmp Merge remote-tracking branch 'asoc/topic/wm8904' into tmp Mark Langsdorf (1): sata, highbank: fix ordering of SGPIO signals Martin Peschke (3): [SCSI] zfcp: fix lock imbalance by reworking request queue locking [SCSI] zfcp: fix schedule-inside-lock in scsi_device list loops [SCSI] zfcp: remove access control tables interface (keep sysfs files) Matthew Garrett (1): Revert "hp-wmi: Enable hotkeys on some systems" Maxime Ripard (3): pinctrl: sunxi: Read register before writing to it in irq_set_type pinctrl: sunxi: Fix gpio_set behaviour pinctrl: sunxi: Add spinlocks Michal Hocko (1): memcg: get rid of swapaccount leftovers Nicolas Ferre (2): ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C ARM: at91/DT: fix at91sam9n12ek memory node Nicolas Pitre (1): ARM: 7816/1: CONFIG_KUSER_HELPERS: fix help text Nicolin Chen (1): ASoC: fsl: Add S/PDIF machine driver Oleg Nesterov (1): proc: kill the extra proc_readfd_common()->dir_emit_dots() Olof Johansson (2): Merge tag 'samsung-fixes-2' of git://git.kernel.org/.../kgene/linux-samsung into fixes Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes Pali Rohár (1): drm/nouveau: fix reclocking on nv40 Paolo Bonzini (2): Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/.../maz/arm-platforms into kvm-master Merge tag 'kvm-arm-fixes-3.11' of git://git.linaro.org/people/cdall/linux-kvm-arm into kvm-master Peter Meerwald (1): iio: adjd_s311: Fix non-scan mode data read Peter Wu (1): r8169: remember WOL preferences on driver load Radu Caragea (1): x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member Rafael J. Wysocki (1): Revert "ACPI / video: Always call acpi_video_init_brightness() on init" Rafał Miłecki (1): drm/radeon: fix WREG32_OR macro setting bits in a register Randy Dunlap (1): kernel: fix new kernel-doc warning in wait.c Richard Genoud (1): proc: return on proc_readdir error Richard Laager (1): lib/lz4: correct the LZ4 license Roland Dreier (1): [SCSI] sg: Fix user memory corruption when SG_IO is interrupted by a signal Russell King (1): Merge branch 'security-fixes' into fixes Sathya Perla (1): be2net: fix disabling TX in be_close() Sekhar Nori (1): ARM: davinci: nand: specify ecc strength Stanislaw Gruszka (1): iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULL Stefano Stabellini (1): Merging v3.10-rc2 as I need to apply a fix for Stephen Warren (1): ARM: tegra: always enable USB VBUS regulators Steven Rostedt (1): nohz: Do not warn about unstable tsc unless user uses nohz_full Steven Whitehouse (2): GFS2: Fix typo in gfs2_create_inode() GFS2: Check for glock already held in gfs2_getxattr Tejun Heo (1): GFS2: WQ_NON_REENTRANT is meaningless and going away Terry Suereth (1): libata: apply behavioral quirks to sil3826 PMP Tomasz Figa (1): ASoC: Samsung: Do not queue cyclic buffers multiple times Torsten Kaiser (2): x86, microcode, AMD: Make cpu_has_amd_erratum() use the correct struct cpuinfo_x86 x86, microcode, AMD: Fix early microcode loading Toshiaki Makita (1): bridge: Use the correct bit length for bitmap functions in the VLAN code Vijaya Kumar K (1): ARM: 7815/1: kexec: offline non panic CPUs on Kdump panic Vlad Yasevich (3): macvtap: simplify usage of tap_features macvtap: Correctly set tap features when IFF_VNET_HDR is disabled. macvtap: Ignore tap features when VNET_HDR is off Vyacheslav Dubeyko (2): nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection Wei Yongjun (2): sony-laptop: return a negative error code in sonypi_compat_init() ASoC: fsl_spdif: remove redundant dev_err call in fsl_spdif_probe() Will Deacon (2): arm64: perf: fix array out of bounds access in armpmu_map_hw_event() arm64: perf: fix event validation for software group leaders Willem de Bruijn (1): packet: restore packet statistics tp_packets to include drops Wladislav Wiebe (1): of: fdt: fix memory initialization for expanded DT Yuval Mintz (1): bnx2x: prevent VF benign attentions stephen hemminger (1): ipv4: expose IPV4_DEVCONF .../devicetree/bindings/sound/imx-audio-spdif.txt | 34 +++++ .../devicetree/bindings/sound/mvebu-audio.txt | 29 ++++ Documentation/kernel-parameters.txt | 2 +- MAINTAINERS | 6 +- Makefile | 2 +- arch/arc/lib/strchr-700.S | 10 ++ arch/arm/boot/dts/at91sam9n12ek.dts | 4 +- arch/arm/boot/dts/at91sam9x5ek.dtsi | 5 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 + arch/arm/boot/dts/tegra20-trimslice.dts | 2 + arch/arm/boot/dts/tegra20-whistler.dts | 4 + arch/arm/kernel/fiq.c | 3 +- arch/arm/kernel/machine_kexec.c | 1 + arch/arm/kvm/coproc.c | 26 +++- arch/arm/kvm/coproc.h | 3 + arch/arm/kvm/coproc_a15.c | 6 +- arch/arm/kvm/mmio.c | 3 +- arch/arm/kvm/mmu.c | 36 +++-- arch/arm/mach-at91/at91sam9x5.c | 2 + arch/arm/mach-davinci/board-dm355-leopard.c | 1 + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + arch/arm/mach-davinci/board-neuros-osd2.c | 1 + arch/arm/mach-omap2/board-n8x0.c | 4 - arch/arm/mach-omap2/board-rx51.c | 2 +- arch/arm/mach-omap2/usb-musb.c | 5 +- arch/arm/mm/Kconfig | 9 +- arch/arm/plat-samsung/init.c | 5 +- arch/arm/plat-samsung/s3c-dma-ops.c | 13 +- arch/arm/xen/enlighten.c | 1 + arch/arm64/include/asm/kvm_asm.h | 17 ++- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kernel/perf_event.c | 10 +- arch/arm64/kvm/hyp.S | 13 ++ arch/arm64/kvm/sys_regs.c | 3 + arch/mips/math-emu/cp1emu.c | 26 ++++ arch/x86/include/asm/bootparam_utils.h | 4 +- arch/x86/include/asm/microcode_amd.h | 2 +- arch/x86/kernel/cpu/amd.c | 20 +-- arch/x86/kernel/microcode_amd.c | 27 ++-- arch/x86/kernel/microcode_amd_early.c | 27 ++-- arch/x86/kernel/sys_x86_64.c | 2 +- arch/x86/mm/mmap.c | 8 +- arch/x86/xen/setup.c | 22 +++ arch/x86/xen/smp.c | 11 +- drivers/acpi/video.c | 11 +- drivers/ata/libata-pmp.c | 12 +- drivers/ata/sata_fsl.c | 5 +- drivers/ata/sata_highbank.c | 4 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 3 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++ drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 86 ++++++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 12 ++ drivers/gpu/drm/nouveau/core/core/mm.c | 4 + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 7 +- drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c | 12 +- drivers/gpu/drm/nouveau/core/subdev/fb/ramnv4e.c | 4 +- drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c | 34 +++-- drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 6 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 3 +- drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 3 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 58 +++++--- drivers/gpu/drm/nouveau/dispnv04/disp.h | 1 + drivers/gpu/drm/nouveau/nouveau_display.c | 3 + drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_uvd.c | 8 ++ drivers/gpu/drm/radeon/rv770.c | 12 +- drivers/iio/light/adjd_s311.c | 3 +- drivers/md/dm-cache-policy-mq.c | 16 +-- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 49 +++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 3 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 45 +++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 56 ++++---- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- drivers/net/ethernet/realtek/r8169.c | 2 +- drivers/net/ethernet/sfc/filter.c | 2 +- drivers/net/irda/via-ircc.c | 6 +- drivers/net/macvtap.c | 18 +-- drivers/net/phy/realtek.c | 4 +- drivers/net/usb/hso.c | 15 ++- drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 2 - drivers/net/wireless/iwlwifi/mvm/time-event.c | 33 +++-- drivers/net/wireless/iwlwifi/pcie/rx.c | 8 -- drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +- drivers/net/wireless/zd1201.c | 4 +- drivers/of/fdt.c | 2 + drivers/pinctrl/pinctrl-sunxi.c | 66 ++++++++- drivers/pinctrl/pinctrl-sunxi.h | 2 + drivers/platform/olpc/olpc-ec.c | 2 +- drivers/platform/x86/hp-wmi.c | 16 --- drivers/platform/x86/sony-laptop.c | 8 +- drivers/s390/scsi/zfcp_erp.c | 29 +++- drivers/s390/scsi/zfcp_qdio.c | 8 +- drivers/s390/scsi/zfcp_sysfs.c | 14 ++ drivers/scsi/Kconfig | 1 - drivers/staging/comedi/drivers.c | 2 +- drivers/usb/host/ohci-pci.c | 5 + drivers/usb/phy/phy-fsl-usb.h | 2 +- drivers/usb/phy/phy-fsm-usb.c | 2 +- drivers/xen/events.c | 13 +- fs/bfs/inode.c | 2 +- fs/bio.c | 20 ++- fs/dcache.c | 11 ++ fs/efs/inode.c | 2 +- fs/gfs2/glock.c | 8 +- fs/gfs2/glops.c | 18 ++- fs/gfs2/inode.c | 6 +- fs/gfs2/main.c | 2 +- fs/hugetlbfs/inode.c | 8 +- fs/namespace.c | 2 +- fs/nilfs2/segbuf.c | 5 +- fs/proc/fd.c | 2 - fs/proc/generic.c | 2 +- fs/proc/root.c | 4 +- include/linux/dcache.h | 1 + include/linux/inetdevice.h | 34 +---- include/linux/ipv6.h | 1 + include/linux/mm_types.h | 1 + include/linux/sched.h | 1 - include/linux/wait.h | 57 ++++++++ include/net/ip6_route.h | 2 + include/sound/soc-dapm.h | 2 +- include/uapi/linux/ip.h | 34 +++++ init/Kconfig | 2 +- kernel/cpuset.c | 14 +- kernel/time/sched_clock.c | 2 +- kernel/time/tick-sched.c | 5 +- kernel/wait.c | 3 +- lib/lz4/lz4_compress.c | 4 +- lib/lz4/lz4_decompress.c | 6 +- lib/lz4/lz4hc_compress.c | 4 +- mm/memcontrol.c | 1 - mm/shmem.c | 8 +- net/batman-adv/unicast.c | 10 +- net/bridge/br_fdb.c | 10 +- net/bridge/br_netlink.c | 4 +- net/bridge/br_vlan.c | 4 +- net/ipv4/tcp.c | 7 + net/ipv6/addrconf.c | 10 +- net/ipv6/ndisc.c | 4 +- net/ipv6/reassembly.c | 5 + net/ipv6/route.c | 21 +++ net/netlink/genetlink.c | 7 - net/packet/af_packet.c | 2 + net/wireless/nl80211.c | 22 +-- net/wireless/sme.c | 10 +- sound/soc/cirrus/ep93xx-i2s.c | 2 - sound/soc/codecs/dmic.c | 17 +-- sound/soc/codecs/tlv320aic32x4.c | 22 +-- sound/soc/codecs/wm8904.c | 1 - sound/soc/dwc/designware_i2s.c | 5 +- sound/soc/fsl/Kconfig | 10 ++ sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_spdif.c | 17 +-- sound/soc/fsl/fsl_ssi.c | 1 - sound/soc/fsl/imx-spdif.c | 148 +++++++++++++++++++++ sound/soc/generic/simple-card.c | 2 + sound/soc/kirkwood/Kconfig | 4 +- sound/soc/kirkwood/kirkwood-i2s.c | 26 +++- sound/soc/samsung/dma.c | 7 + sound/soc/sh/fsi.c | 51 ++++--- sound/soc/soc-core.c | 9 +- sound/soc/soc-dapm.c | 9 +- sound/soc/soc-jack.c | 2 - 172 files changed, 1316 insertions(+), 598 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/mvebu-audio.txt create mode 100644 sound/soc/fsl/imx-spdif.c

2 1

[alsa-devel] [PATCH] ASoC: fsl: Drop SND_SOC_FSL_UTILS from SND_SOC_IMX_SPDIF
by Fabio Estevam 30 Aug '13

30 Aug '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> SND_SOC_FSL_UTILS is only used by PowerPC machines, so let's drop it in the i.mx case. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index a708380..704e246 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -197,7 +197,6 @@ config SND_SOC_IMX_SPDIF tristate "SoC Audio support for i.MX boards with S/PDIF" select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_SPDIF - select SND_SOC_FSL_UTILS select SND_SOC_SPDIF help SoC Audio support for i.MX boards with S/PDIF -- 1.8.1.2

3 2

[alsa-devel] [PATCH v12] ASoC: fsl: Add S/PDIF machine driver
by Nicolin Chen 29 Aug '13

29 Aug '13

This patch implements a device-tree-only machine driver for Freescale i.MX series Soc. It works with spdif_transmitter/spdif_receiver and fsl_spdif.c drivers. Signed-off-by: Nicolin Chen <b42378(a)freescale.com> --- Changelog v11->v12: * Dropped unused spdif_pdev. * Register spdif-dit/dir depending on DT bool property. v10->v11: * Use boolean properties for spdif-out/in switch instead of codec phandles. * Accordingly create dummy codec driver in probe() instead of DT nodes. .../devicetree/bindings/sound/imx-audio-spdif.txt | 34 +++++ sound/soc/fsl/Kconfig | 11 ++ sound/soc/fsl/Makefile | 2 + sound/soc/fsl/imx-spdif.c | 148 ++++++++++++++++++++ 4 files changed, 195 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt create mode 100644 sound/soc/fsl/imx-spdif.c diff --git a/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt b/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt new file mode 100644 index 0000000..7d13479 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/imx-audio-spdif.txt @@ -0,0 +1,34 @@ +Freescale i.MX audio complex with S/PDIF transceiver + +Required properties: + + - compatible : "fsl,imx-audio-spdif" + + - model : The user-visible name of this sound complex + + - spdif-controller : The phandle of the i.MX S/PDIF controller + + +Optional properties: + + - spdif-out : This is a boolean property. If present, the transmitting + function of S/PDIF will be enabled, indicating there's a physical + S/PDIF out connector/jack on the board or it's connecting to some + other IP block, such as an HDMI encoder/display-controller. + + - spdif-in : This is a boolean property. If present, the receiving + function of S/PDIF will be enabled, indicating there's a physical + S/PDIF in connector/jack on the board. + +* Note: At least one of these two properties should be set in the DT binding. + + +Example: + +sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-out; + spdif-in; +}; diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index cd088cc..a708380 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -193,6 +193,17 @@ config SND_SOC_IMX_SGTL5000 Say Y if you want to add support for SoC audio on an i.MX board with a sgtl5000 codec. +config SND_SOC_IMX_SPDIF + tristate "SoC Audio support for i.MX boards with S/PDIF" + select SND_SOC_IMX_PCM_DMA + select SND_SOC_FSL_SPDIF + select SND_SOC_FSL_UTILS + select SND_SOC_SPDIF + help + SoC Audio support for i.MX boards with S/PDIF + Say Y if you want to add support for SoC audio on an i.MX board with + a S/DPDIF. + config SND_SOC_IMX_MC13783 tristate "SoC Audio support for I.MX boards with mc13783" depends on MFD_MC13783 && ARM diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index 4b5970e..e2aaff7 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -45,6 +45,7 @@ snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o snd-soc-wm1133-ev1-objs := wm1133-ev1.o snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o snd-soc-imx-wm8962-objs := imx-wm8962.o +snd-soc-imx-spdif-objs :=imx-spdif.o snd-soc-imx-mc13783-objs := imx-mc13783.o obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o @@ -53,4 +54,5 @@ obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o +obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c new file mode 100644 index 0000000..816013b --- /dev/null +++ b/sound/soc/fsl/imx-spdif.c @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2013 Freescale Semiconductor, Inc. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/module.h> +#include <linux/of_platform.h> +#include <sound/soc.h> + +struct imx_spdif_data { + struct snd_soc_dai_link dai[2]; + struct snd_soc_card card; + struct platform_device *txdev; + struct platform_device *rxdev; +}; + +static int imx_spdif_audio_probe(struct platform_device *pdev) +{ + struct device_node *spdif_np, *np = pdev->dev.of_node; + struct imx_spdif_data *data; + int ret = 0, num_links = 0; + + spdif_np = of_parse_phandle(np, "spdif-controller", 0); + if (!spdif_np) { + dev_err(&pdev->dev, "failed to find spdif-controller\n"); + ret = -EINVAL; + goto end; + } + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) { + dev_err(&pdev->dev, "failed to allocate memory\n"); + ret = -ENOMEM; + goto end; + } + + if (of_property_read_bool(np, "spdif-out")) { + data->dai[num_links].name = "S/PDIF TX"; + data->dai[num_links].stream_name = "S/PDIF PCM Playback"; + data->dai[num_links].codec_dai_name = "dit-hifi"; + data->dai[num_links].codec_name = "spdif-dit"; + data->dai[num_links].cpu_of_node = spdif_np; + data->dai[num_links].platform_of_node = spdif_np; + num_links++; + + data->txdev = platform_device_register_simple("spdif-dit", -1, NULL, 0); + if (IS_ERR(data->txdev)) { + ret = PTR_ERR(data->txdev); + dev_err(&pdev->dev, "register dit failed: %d\n", ret); + goto end; + } + } + + if (of_property_read_bool(np, "spdif-in")) { + data->dai[num_links].name = "S/PDIF RX"; + data->dai[num_links].stream_name = "S/PDIF PCM Capture"; + data->dai[num_links].codec_dai_name = "dir-hifi"; + data->dai[num_links].codec_name = "spdif-dir"; + data->dai[num_links].cpu_of_node = spdif_np; + data->dai[num_links].platform_of_node = spdif_np; + num_links++; + + data->rxdev = platform_device_register_simple("spdif-dir", -1, NULL, 0); + if (IS_ERR(data->rxdev)) { + ret = PTR_ERR(data->rxdev); + dev_err(&pdev->dev, "register dir failed: %d\n", ret); + goto error_dit; + } + } + + if (!num_links) { + dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); + goto error_dir; + } + + data->card.dev = &pdev->dev; + data->card.num_links = num_links; + data->card.dai_link = data->dai; + + ret = snd_soc_of_parse_card_name(&data->card, "model"); + if (ret) + goto error_dir; + + ret = snd_soc_register_card(&data->card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); + goto error_dir; + } + + platform_set_drvdata(pdev, data); + + goto end; + +error_dir: + if (data->rxdev) + platform_device_unregister(data->rxdev); +error_dit: + if (data->txdev) + platform_device_unregister(data->txdev); +end: + if (spdif_np) + of_node_put(spdif_np); + + return ret; +} + +static int imx_spdif_audio_remove(struct platform_device *pdev) +{ + struct imx_spdif_data *data = platform_get_drvdata(pdev); + + if (data->rxdev) + platform_device_unregister(data->rxdev); + if (data->txdev) + platform_device_unregister(data->txdev); + + snd_soc_unregister_card(&data->card); + + return 0; +} + +static const struct of_device_id imx_spdif_dt_ids[] = { + { .compatible = "fsl,imx-audio-spdif", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx_spdif_dt_ids); + +static struct platform_driver imx_spdif_driver = { + .driver = { + .name = "imx-spdif", + .owner = THIS_MODULE, + .of_match_table = imx_spdif_dt_ids, + }, + .probe = imx_spdif_audio_probe, + .remove = imx_spdif_audio_remove, +}; + +module_platform_driver(imx_spdif_driver); + +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Freescale i.MX S/PDIF machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-spdif"); -- 1.7.1

3 2

[alsa-devel] [PATCH] alsa-info: Run without lspci (if there is no pci bus)
by David Henningsson 29 Aug '13

29 Aug '13

On some embedded ARM hardware, there is no pci bus. In that case, do not require lspci so we can still get as much info as we can. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- alsa/utils/alsa-info.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/alsa/utils/alsa-info.sh b/alsa/utils/alsa-info.sh index 9d996aa..2280af5 100755 --- a/alsa/utils/alsa-info.sh +++ b/alsa/utils/alsa-info.sh @@ -393,8 +393,10 @@ trap cleanup 0 if [ "$PROCEED" = "yes" ]; then if [ -z "$LSPCI" ]; then - echo "This script requires lspci. Please install it, and re-run this script." - exit 0 + if [ -d /sys/bus/pci ]; then + echo "This script requires lspci. Please install it, and re-run this script." + exit 0 + fi fi #Fetch the info and store in temp files/variables @@ -407,8 +409,6 @@ KERNEL_OS=`uname -o` ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'` get_alsa_library_version ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}` -VENDOR_ID=`lspci -vn | grep 040[1-3] | awk -F':' '{print $3}'| awk {'print substr($0, 2);}' >$TEMPDIR/vendor_id.tmp` -DEVICE_ID=`lspci -vn | grep 040[1-3] | awk -F':' '{print $4}'| awk {'print $1'} >$TEMPDIR/device_id.tmp` LAST_CARD=$((`grep "]: " /proc/asound/cards | wc -l` - 1 )) ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null) @@ -434,7 +434,9 @@ fi cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp cat /proc/asound/cards >$TEMPDIR/alsacards.tmp +if [[ ! -z "$LSPCI" ]]; then lspci |grep -i "multi\|audio">$TEMPDIR/lspci.tmp +fi #Check for HDA-Intel cards codec#* cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null @@ -547,6 +549,8 @@ echo "" >> $FILE cat $TEMPDIR/alsacards.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE + +if [[ ! -z "$LSPCI" ]]; then echo "!!PCI Soundcards installed in the system" >> $FILE echo "!!--------------------------------------" >> $FILE echo "" >> $FILE @@ -559,6 +563,7 @@ echo "" >> $FILE lspci -vvn |grep -A1 040[1-3] >> $FILE echo "" >> $FILE echo "" >> $FILE +fi if [ "$SNDOPTIONS" ] then -- 1.7.9.5

2 3

[alsa-devel] Compiling pyalsa with the latest alsalib
by Proyecto MultiK 29 Aug '13

29 Aug '13

Hello, Together with a team, I am working on a multiseat project for which we need to access more than 32 sound cards on a Linux system (not all used simultaneously). We are running Ubuntu with a modified version of the 3.6.3 kernel. We used the code from Takashi Iwai's sound repository to patch the original 3.6.3 source to allow ALSA to recognize and name more than 32 devices (since there was a bug introduced in the 3.8 kernel which threw a kernel panic when connecting more than 28 cards, we could not use the latest kernel). Currently, we can detect more than 36 sound cards, they have ids and names given in /proc/asound/cards. Before applying Takashi's patches, they would stop being named at id = 31. So this seems to be working all right. The problem comes when trying to access the cards using pyalsa. We downloaded the pyalsa 1.0.26 tar from ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-1.0.26.tar.bz2. We need to know how to compile pyalsa with the latest alsalib that supports more than 32 cards. If we run pyalsa.alsacard.asoundlib_version() from the python interpreter, we get '1.0.25'. We know the latest version is 1.0.27 and we have put the alsa headers in pyalsa-1.0.26/pyalsa/alsa/ dir before compiling, but it doesn't seem to compile using these files and keeps saying version is 1.0.25. Guidance on this would be greatly appreciated. Thanks, Esteban Serrano MultiK team

2 1

[alsa-devel] [PATCH 1/3] ASoC: fsl_ssi: Remove unnecessary dev_set_drvdata()
by Fabio Estevam 29 Aug '13

29 Aug '13

Driver core clears the driver data to NULL after device_release or on probe failure, so just remove it from here. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/fsl_ssi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0c072ff..6f4a4c5 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -909,7 +909,6 @@ error_dai: snd_soc_unregister_component(&pdev->dev); error_dev: - dev_set_drvdata(&pdev->dev, NULL); device_remove_file(&pdev->dev, dev_attr); error_clk: @@ -935,7 +934,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) snd_soc_unregister_component(&pdev->dev); device_remove_file(&pdev->dev, &ssi_private->dev_attr); irq_dispose_mapping(ssi_private->irq); - dev_set_drvdata(&pdev->dev, NULL); return 0; } -- 1.8.1.2

2 5

Re: [alsa-devel] [PATCH -next] ASoC: fsl_spdif: remove redundant dev_err call in fsl_spdif_probe()
by Mark Brown 29 Aug '13

29 Aug '13

On Thu, Aug 29, 2013 at 08:00:05AM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > There is a error message within devm_ioremap_resource > already, so remove the dev_err call to avoid redundant > error message. Applied, thanks.

1 0

[alsa-devel] [RFC] ASoC: soc-pcm: Add support for unidirectional dai links
by Fabio Estevam 29 Aug '13

29 Aug '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> On a mx28 board, running "aplay -l" and "arecord -l" results in the following: $ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: mxssgtl5000 [mxs_sgtl5000], device 0: Playback sgtl5000-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: mxssgtl5000 [mxs_sgtl5000], device 1: Capture sgtl5000-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 $ arecord -l **** List of CAPTURE Hardware Devices **** card 0: mxssgtl5000 [mxs_sgtl5000], device 0: Playback sgtl5000-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: mxssgtl5000 [mxs_sgtl5000], device 1: Capture sgtl5000-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 ,which is not correct because we got a capture device listed in aplay and a playback device listed in arecord. On mx28 there are two serial audio interface ports (SAIF0 and SAIF1) and each one of them are unidirectional. Allow to specify a dai link as 'playback_only' or 'capture_only', which suits well for this case. After this change we can correctly report the capabilities as follows: $ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: mxssgtl5000 [mxs_sgtl5000], device 0: HiFi Playback sgtl5000-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 $ arecord -l **** List of CAPTURE Hardware Devices **** card 0: mxssgtl5000 [mxs_sgtl5000], device 1: HiFi Capture sgtl5000-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 Also tested playback and capture on the mx28evk board. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- After I get some feedback, I can split the patch in two parts (one for soc-pcm and another one for mxs-sgtl5000). include/sound/soc.h | 4 ++++ sound/soc/mxs/mxs-sgtl5000.c | 2 ++ sound/soc/soc-pcm.c | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8e2ad52..774d3be 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -934,6 +934,10 @@ struct snd_soc_dai_link { /* machine stream operations */ const struct snd_soc_ops *ops; const struct snd_soc_compr_ops *compr_ops; + + /* For unidirectional dai links */ + bool playback_only; + bool capture_only; }; struct snd_soc_codec_conf { diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index ce084eb..4bb2737 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -105,11 +105,13 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { .stream_name = "HiFi Playback", .codec_dai_name = "sgtl5000", .ops = &mxs_sgtl5000_hifi_ops, + .playback_only = true, }, { .name = "HiFi Rx", .stream_name = "HiFi Capture", .codec_dai_name = "sgtl5000", .ops = &mxs_sgtl5000_hifi_ops, + .capture_only = true, }, }; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fb70fbe..5e44863 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2020,6 +2020,16 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) capture = 1; } + if (rtd->dai_link->playback_only) { + playback = 1; + capture = 0; + } + + if (rtd->dai_link->capture_only) { + playback = 0; + capture = 1; + } + /* create the PCM */ if (rtd->dai_link->no_pcm) { snprintf(new_name, sizeof(new_name), "(%s)", -- 1.8.1.2

3 3