6977966888
- Backport upstream fix patches, including the deadlock fix for aplay/arecord (boo#1031525): 0001-ucm-Add-ATTRIBUTE_UNUSED-for-unused-parameters-of-ex.patch 0002-ucm-parser-needs-limits.h.patch 0003-pcm-direct-allow-users-to-configure-different-period.patch 0004-pcm-dshare-enable-silence.patch 0005-pcm-rate-fix-the-hw_ptr-update-until-the-boundary-av.patch 0006-plugin-dynamically-update-avail_min-on-slave.patch 0007-rate-dynamic-update-avail_min-on-slave.patch 0008-topology-fix-unused-const-variable-warning.patch 0009-seq-improve-documentation-about-new-get-pid-card-fun.patch 0010-pcm-direct-returning-semop-error-code-for-semaphore-.patch 0011-pcm-direct-Fix-for-sync-issue-on-xrun-recover.patch 0012-pcm-direct-check-state-before-enter-poll-on-timer.patch 0013-pcm-direct-don-t-return-bogus-buffer-levels-in-xrun-.patch 0014-conf-ucm-broxton-add-broxton-rt298-conf-files.patch 0015-pcm-direct-Fix-deadlock-in-poll_descriptors.patch 0016-ucm-Assure-the-user-input-card-name-not-to-exceed-ma.patch 0017-ucm-Load-device-specific-configuration-file-based-on.patch 0018-ucm-Add-command-get-_file-to-get-the-config-file-nam.patch 0019-topology-Fix-incorrect-license-in-source-comments.patch 0020-conf-cards-add-support-for-pistachio-card.patch 0021-pcm-multi-Drop-the-fixed-slave_map-in-snd_pcm_multi_.patch 0022-conf-Add-card-config-for-Intel-HDMI-DP-LPE-audio.patch 0023-pcm-Avoid-lock-for-snd_pcm_nonblock.patch 0024-pcm-Disable-locking-in-async-mode.patch 0025-pcm-dmix-Allow-disabling-x86-optimizations.patch 0026-pcm-dmix_rewind-corrupts-application-pointer-fix.patch 0027-pcm-direct-fix-race-on-clearing-timer-events.patch 0028-pcm-file-Enable-file-writing-for-capture-path.patch OBS-URL: https://build.opensuse.org/request/show/483406 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=210
101 lines
3.4 KiB
Diff
101 lines
3.4 KiB
Diff
From 4dfa8f08fb834f7b087f35f9ba1746cd0c989d02 Mon Sep 17 00:00:00 2001
|
|
From: Manohar Narkhede <Manohar.Narkhede@imgtec.com>
|
|
Date: Wed, 25 Jan 2017 22:14:15 +0100
|
|
Subject: [PATCH 20/43] conf/cards: add support for pistachio-card.
|
|
|
|
The data sheet of the chip and technical reference manual can be found at https://docs.creatordev.io/ci40/guides/hardwaredocs/cXT200_datasheet2.pdf
|
|
and https://docs.creatordev.io/ci40/guides/hardwaredocs/MIPS_Creator_cXT200_Technical_Reference_Manual_1.0.112.pdf.
|
|
|
|
The additional information about the cards can be found in src/conf/cards/pistachio-card.conf file.
|
|
|
|
Signed-off-by: Manohar Narkhede <Manohar.Narkhede@imgtec.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/cards/Makefile.am | 1
|
|
src/conf/cards/aliases.conf | 1
|
|
src/conf/cards/pistachio-card.conf | 58 +++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 60 insertions(+)
|
|
create mode 100644 src/conf/cards/pistachio-card.conf
|
|
|
|
--- a/src/conf/cards/Makefile.am
|
|
+++ b/src/conf/cards/Makefile.am
|
|
@@ -39,6 +39,7 @@ cfg_files = aliases.conf \
|
|
Maestro3.conf \
|
|
NFORCE.conf \
|
|
PC-Speaker.conf \
|
|
+ pistachio-card.conf \
|
|
PMac.conf \
|
|
PMacToonie.conf \
|
|
PS3.conf \
|
|
--- a/src/conf/cards/aliases.conf
|
|
+++ b/src/conf/cards/aliases.conf
|
|
@@ -55,6 +55,7 @@ AV100 cards.CMI8788
|
|
AV200 cards.CMI8788
|
|
CMI8786 cards.CMI8788
|
|
CMI8787 cards.CMI8788
|
|
+pistachio cards.pistachio-card
|
|
|
|
<confdir:pcm/default.conf>
|
|
<confdir:pcm/dmix.conf>
|
|
--- /dev/null
|
|
+++ b/src/conf/cards/pistachio-card.conf
|
|
@@ -0,0 +1,58 @@
|
|
+#
|
|
+# Configuration for the pistachio chip.
|
|
+#
|
|
+# The data sheet of the chip and technical reference manual can be
|
|
+found at
|
|
+https://docs.creatordev.io/ci40/guides/hardwaredocs/cXT200_datasheet2.p
|
|
+df # and
|
|
+https://docs.creatordev.io/ci40/guides/hardwaredocs/MIPS_Creator_cXT200_Technical_Reference_Manual_1.0.112.pdf.
|
|
+#
|
|
+# The list of hardware devices is as per below:
|
|
+#
|
|
+# root@OpenWrt:/# arecord -l
|
|
+# **** List of CAPTURE Hardware Devices **** card 0: pistachiocard [pistachio-card], device 1: pistachio-spdif-in snd-soc-dummy-dai-1 []
|
|
+# Subdevices: 1/1
|
|
+# Subdevice #0: subdevice #0
|
|
+# card 0: pistachiocard [pistachio-card], device 4: pistachio-i2s-in-0 snd-soc-dummy-dai-4 []
|
|
+# Subdevices: 1/1
|
|
+# Subdevice #0: subdevice #0
|
|
+#
|
|
+# root@OpenWrt:/# aplay -l
|
|
+# **** List of PLAYBACK Hardware Devices **** card 0: pistachiocard [pistachio-card], device 0: pistachio-spdif-out snd-soc-dummy-dai-0 []
|
|
+# Subdevices: 1/1
|
|
+# Subdevice #0: subdevice #0
|
|
+# card 0: pistachiocard [pistachio-card], device 2: pistachio-parallel-out pistachio_internal_dac-2 []
|
|
+# Subdevices: 1/1
|
|
+# Subdevice #0: subdevice #0
|
|
+# card 0: pistachiocard [pistachio-card], device 3: pistachio-i2s-out snd-soc-dummy-dai-3 []
|
|
+# Subdevices: 1/1
|
|
+# Subdevice #0: subdevice #0
|
|
+#
|
|
+
|
|
+pistachio-card.pcm.default{
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ default "pistachio"
|
|
+ }
|
|
+ @args.DEVICE {
|
|
+ type integer
|
|
+ default 2
|
|
+ }
|
|
+
|
|
+ type asym
|
|
+ capture.pcm {
|
|
+ type multi
|
|
+ slaves.a.pcm "hw:0,4"
|
|
+ slaves.a.channels 12
|
|
+ bindings.0.slave a
|
|
+ bindings.0.channel 4
|
|
+ bindings.1.slave a
|
|
+ bindings.1.channel 5
|
|
+ }
|
|
+
|
|
+ playback.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ device $DEVICE
|
|
+
|