mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2026-01-27 11:52:04 +01:00
5bae602366
OE-core updated to v1.2.15. Refresh the patches. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
220 lines
4.0 KiB
Diff
220 lines
4.0 KiB
Diff
From c9b12504edea5280b41645da703ac478c1341dcf Mon Sep 17 00:00:00 2001
|
|
From: Shengjiu Wang <b02247@freescale.com>
|
|
Date: Thu, 5 Jun 2014 17:37:47 +0800
|
|
Subject: [PATCH] add conf for multichannel support in imx
|
|
|
|
Upstream-Status: Inappropriate [platform specific]
|
|
|
|
Signed-off-by: Shengjiu Wang <b02247@freescale.com>
|
|
---
|
|
src/conf/cards/CS42888.conf | 94 ++++++++++++++++++++++++++++++++++++
|
|
src/conf/cards/IMX-HDMI.conf | 67 +++++++++++++++++++++++++
|
|
src/conf/cards/Makefile.am | 2 +
|
|
src/conf/cards/aliases.conf | 2 +
|
|
4 files changed, 165 insertions(+)
|
|
create mode 100644 src/conf/cards/CS42888.conf
|
|
create mode 100644 src/conf/cards/IMX-HDMI.conf
|
|
|
|
diff --git a/src/conf/cards/CS42888.conf b/src/conf/cards/CS42888.conf
|
|
new file mode 100644
|
|
index 000000000000..671a2845894b
|
|
--- /dev/null
|
|
+++ b/src/conf/cards/CS42888.conf
|
|
@@ -0,0 +1,94 @@
|
|
+#
|
|
+# Configuration for the CS42888 chip
|
|
+#
|
|
+
|
|
+# default with dmix & dsnoop
|
|
+CS42888.pcm.default {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type asym
|
|
+ playback.pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ @func concat
|
|
+ strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
|
|
+ }
|
|
+ }
|
|
+ capture.pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ @func concat
|
|
+ strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+<confdir:pcm/surround40.conf>
|
|
+
|
|
+CS42888.pcm.surround40.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ slave.channels 4
|
|
+ ttable.0.0 1
|
|
+ ttable.1.2 1
|
|
+ ttable.2.1 1
|
|
+ ttable.3.3 1
|
|
+}
|
|
+
|
|
+
|
|
+<confdir:pcm/surround41.conf>
|
|
+<confdir:pcm/surround50.conf>
|
|
+<confdir:pcm/surround51.conf>
|
|
+
|
|
+CS42888.pcm.surround51.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ slave.channels 6
|
|
+ ttable.0.0 1
|
|
+ ttable.1.3 1
|
|
+ ttable.2.1 1
|
|
+ ttable.3.4 1
|
|
+ ttable.4.2 1
|
|
+ ttable.5.5 1
|
|
+}
|
|
+
|
|
+<confdir:pcm/surround71.conf>
|
|
+
|
|
+CS42888.pcm.surround71.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ slave.channels 8
|
|
+ ttable.0.0 1
|
|
+ ttable.1.4 1
|
|
+ ttable.2.1 1
|
|
+ ttable.3.5 1
|
|
+ ttable.4.2 1
|
|
+ ttable.5.6 1
|
|
+ ttable.6.3 1
|
|
+ ttable.7.7 1
|
|
+}
|
|
+
|
|
+# vim: ft=alsaconf
|
|
diff --git a/src/conf/cards/IMX-HDMI.conf b/src/conf/cards/IMX-HDMI.conf
|
|
new file mode 100644
|
|
index 000000000000..a51509e8ad5a
|
|
--- /dev/null
|
|
+++ b/src/conf/cards/IMX-HDMI.conf
|
|
@@ -0,0 +1,67 @@
|
|
+#
|
|
+# Configuration for the CS42888 chip
|
|
+#
|
|
+
|
|
+# default with dmix & dsnoop
|
|
+IMX-HDMI.pcm.default {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type asym
|
|
+ playback.pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ @func concat
|
|
+ strings [ "dmix:" $CARD ",FORMAT=S32_LE" ]
|
|
+ }
|
|
+ }
|
|
+ capture.pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ @func concat
|
|
+ strings [ "dsnoop:" $CARD ",FORMAT=S32_LE" ]
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+<confdir:pcm/surround40.conf>
|
|
+
|
|
+IMX-HDMI.pcm.surround40.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type hw
|
|
+ card $CARD
|
|
+ channels 4
|
|
+}
|
|
+
|
|
+
|
|
+<confdir:pcm/surround41.conf>
|
|
+<confdir:pcm/surround50.conf>
|
|
+<confdir:pcm/surround51.conf>
|
|
+
|
|
+IMX-HDMI.pcm.surround51.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type hw
|
|
+ card $CARD
|
|
+ channels 6
|
|
+}
|
|
+
|
|
+<confdir:pcm/surround71.conf>
|
|
+
|
|
+IMX-HDMI.pcm.surround71.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type hw
|
|
+ card $CARD
|
|
+ channels 8
|
|
+}
|
|
+
|
|
+# vim: ft=alsaconf
|
|
diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
|
|
index f387cf4197da..cbd2cd04227d 100644
|
|
--- a/src/conf/cards/Makefile.am
|
|
+++ b/src/conf/cards/Makefile.am
|
|
@@ -1,6 +1,8 @@
|
|
alsaconfigdir = @ALSA_CONFIG_DIR@
|
|
alsadir = $(alsaconfigdir)/cards
|
|
cfg_files = aliases.conf \
|
|
+ CS42888.conf \
|
|
+ IMX-HDMI.conf \
|
|
AACI.conf \
|
|
ATIIXP.conf \
|
|
ATIIXP-SPDMA.conf \
|
|
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
|
index e2d59aa770dc..e05c372a0cf7 100644
|
|
--- a/src/conf/cards/aliases.conf
|
|
+++ b/src/conf/cards/aliases.conf
|
|
@@ -58,6 +58,8 @@ CMI8787 cards.CMI8788
|
|
pistachio cards.pistachio-card
|
|
VC4-HDMI cards.vc4-hdmi
|
|
hda-acpi cards.HDA-Intel
|
|
+imx-cs42888 cards.CS42888
|
|
+imx-hdmi-soc cards.IMX-HDMI
|
|
|
|
<confdir:ctl/default.conf>
|
|
<confdir:pcm/default.conf>
|
|
--
|
|
2.42.0
|
|
|