From 98abb08852cf3ecec9c97084e1073a68ea470de5 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 9 Jan 2023 11:44:41 -0700 Subject: alsa-state: Update asound.conf for linux-imx 5.15 The multi-fifo script is integrated in linux-imx 5.15, and the channel mapping is handled by the kernel, so some pcm devices can be removed. Signed-off-by: Tom Hochstein --- .../alsa-state/imx-generic-bsp/asound.conf | 459 --------------------- .../alsa-state/imx-mainline-bsp/asound.conf | 459 +++++++++++++++++++++ .../alsa-state/alsa-state/imx-nxp-bsp/asound.conf | 271 ++++++++++++ 3 files changed, 730 insertions(+), 459 deletions(-) delete mode 100644 recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf create mode 100644 recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf create mode 100644 recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf diff --git a/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf deleted file mode 100644 index c511018e9..000000000 --- a/recipes-bsp/alsa-state/alsa-state/imx-generic-bsp/asound.conf +++ /dev/null @@ -1,459 +0,0 @@ -defaults.pcm.rate_converter "linear" - -pcm.dmix_48000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 48000 -} -} - -pcm.dmix_44100{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 44100 -} -} - -pcm.dmix_32000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 32000 -} -} - -pcm.dmix_24000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 24000 -} -} - -pcm.dmix_22050{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 22050 -} -} - -pcm.dmix_16000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 16000 -} -} - -pcm.dmix_12000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 12000 -} -} - -pcm.dmix_11025{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 11025 -} -} - -pcm.dmix_8000{ -type dmix -ipc_key 5678293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 8000 -} -} - -pcm.!dsnoop_48000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 48000 -} -} - -pcm.!dsnoop_44100{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 44100 -} -} - -pcm.!dsnoop_32000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 32000 -} -} - -pcm.!dsnoop_24000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 24000 -} -} - -pcm.!dsnoop_22050{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 22050 -} -} - -pcm.!dsnoop_16000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 16000 -} -} - -pcm.!dsnoop_12000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 12000 -} -} - -pcm.!dsnoop_11025{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 11025 -} -} - -pcm.!dsnoop_8000{ -type dsnoop -ipc_key 5778293 -ipc_key_add_uid yes -slave{ -pcm "hw:0,0" -period_time 40000 -format S16_LE -rate 8000 -} -} - -pcm.asymed{ -type asym -playback.pcm "dmix_44100" -capture.pcm "dsnoop_44100" -} - -pcm.dsp0{ -type plug -slave.pcm "asymed" -} - -pcm.!default{ -type plug -route_policy "average" -slave.pcm "asymed" -} - -ctl.!default{ -type hw -card 0 -} - -ctl.mixer0{ -type hw -card 0 -} - -pcm_slave.esai{ - pcm "hw:0,0" - channels 8 - rate 48000 - period_time 40000 -} - -pcm.esaich1to6{ - type dshare - ipc_key 5778293 - slave esai - bindings.0 0 - bindings.1 4 - bindings.2 1 - bindings.3 5 - bindings.4 2 - bindings.5 6 -} - -pcm.esaich78{ - type dshare - ipc_key 5778293 - slave esai - bindings.0 3 - bindings.1 7 -} - -pcm_slave.sai5 { - pcm "hw:5,0" - channels 8 -} - -pcm.sai5_ch1to8 { - type dsnoop - ipc_key 5185558 - slave sai5 - bindings.0 0 - bindings.1 4 - bindings.2 1 - bindings.3 5 - bindings.4 2 - bindings.5 6 - bindings.6 3 - bindings.7 7 -} - -pcm.sai5_ch1to6 { - type dsnoop - ipc_key 5165558 - slave sai5 - bindings.0 0 - bindings.1 4 - bindings.2 1 - bindings.3 5 - bindings.4 2 - bindings.5 6 -} - -pcm.sai5_ch1to4 { - type dsnoop - ipc_key 5145558 - slave sai5 - bindings.0 0 - bindings.1 4 - bindings.2 1 - bindings.3 5 -} - -pcm_slave.sai1{ - pcm "hw:4,0" - channels 16 -} - -pcm.sai1to16{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 - bindings.6 3 - bindings.7 11 - bindings.8 4 - bindings.9 12 - bindings.10 5 - bindings.11 13 - bindings.12 6 - bindings.13 14 - bindings.14 7 - bindings.15 15 -} - -pcm.sai1to14{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 - bindings.6 3 - bindings.7 11 - bindings.8 4 - bindings.9 12 - bindings.10 5 - bindings.11 13 - bindings.12 6 - bindings.13 14 -} - -pcm.sai1to12{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 - bindings.6 3 - bindings.7 11 - bindings.8 4 - bindings.9 12 - bindings.10 5 - bindings.11 13 -} - -pcm.sai1to10{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 - bindings.6 3 - bindings.7 11 - bindings.8 4 - bindings.9 12 -} - -pcm.sai1to8{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 - bindings.6 3 - bindings.7 11 -} - -pcm.sai1to6{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 - bindings.4 2 - bindings.5 10 -} - -pcm.sai1to4{ - type dshare - slave sai1 - ipc_key 5144458 - bindings.0 0 - bindings.1 8 - bindings.2 1 - bindings.3 9 -} - -pcm.cdnhdmi4ch { - type dshare - slave { - pcm "hw:3,0" - channels 4 - } - ipc_key 5144458 - bindings.0 0 - bindings.1 2 - bindings.2 1 - bindings.3 3 -} - -pcm.cdnhdmi8ch { - type dshare - slave { - pcm "hw:3,0" - channels 8 - } - ipc_key 5144458 - bindings.0 0 - bindings.1 4 - bindings.2 1 - bindings.3 5 - bindings.4 2 - bindings.5 6 - bindings.6 3 - bindings.7 7 -} diff --git a/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf new file mode 100644 index 000000000..c511018e9 --- /dev/null +++ b/recipes-bsp/alsa-state/alsa-state/imx-mainline-bsp/asound.conf @@ -0,0 +1,459 @@ +defaults.pcm.rate_converter "linear" + +pcm.dmix_48000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.dmix_44100{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.dmix_32000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.dmix_24000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.dmix_22050{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.dmix_16000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.dmix_12000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.dmix_11025{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.dmix_8000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.!dsnoop_48000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.!dsnoop_44100{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.!dsnoop_32000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.!dsnoop_24000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.!dsnoop_22050{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.!dsnoop_16000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.!dsnoop_12000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.!dsnoop_11025{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.!dsnoop_8000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.asymed{ +type asym +playback.pcm "dmix_44100" +capture.pcm "dsnoop_44100" +} + +pcm.dsp0{ +type plug +slave.pcm "asymed" +} + +pcm.!default{ +type plug +route_policy "average" +slave.pcm "asymed" +} + +ctl.!default{ +type hw +card 0 +} + +ctl.mixer0{ +type hw +card 0 +} + +pcm_slave.esai{ + pcm "hw:0,0" + channels 8 + rate 48000 + period_time 40000 +} + +pcm.esaich1to6{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 +} + +pcm.esaich78{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 3 + bindings.1 7 +} + +pcm_slave.sai5 { + pcm "hw:5,0" + channels 8 +} + +pcm.sai5_ch1to8 { + type dsnoop + ipc_key 5185558 + slave sai5 + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 + bindings.6 3 + bindings.7 7 +} + +pcm.sai5_ch1to6 { + type dsnoop + ipc_key 5165558 + slave sai5 + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 +} + +pcm.sai5_ch1to4 { + type dsnoop + ipc_key 5145558 + slave sai5 + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 +} + +pcm_slave.sai1{ + pcm "hw:4,0" + channels 16 +} + +pcm.sai1to16{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 + bindings.6 3 + bindings.7 11 + bindings.8 4 + bindings.9 12 + bindings.10 5 + bindings.11 13 + bindings.12 6 + bindings.13 14 + bindings.14 7 + bindings.15 15 +} + +pcm.sai1to14{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 + bindings.6 3 + bindings.7 11 + bindings.8 4 + bindings.9 12 + bindings.10 5 + bindings.11 13 + bindings.12 6 + bindings.13 14 +} + +pcm.sai1to12{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 + bindings.6 3 + bindings.7 11 + bindings.8 4 + bindings.9 12 + bindings.10 5 + bindings.11 13 +} + +pcm.sai1to10{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 + bindings.6 3 + bindings.7 11 + bindings.8 4 + bindings.9 12 +} + +pcm.sai1to8{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 + bindings.6 3 + bindings.7 11 +} + +pcm.sai1to6{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 + bindings.4 2 + bindings.5 10 +} + +pcm.sai1to4{ + type dshare + slave sai1 + ipc_key 5144458 + bindings.0 0 + bindings.1 8 + bindings.2 1 + bindings.3 9 +} + +pcm.cdnhdmi4ch { + type dshare + slave { + pcm "hw:3,0" + channels 4 + } + ipc_key 5144458 + bindings.0 0 + bindings.1 2 + bindings.2 1 + bindings.3 3 +} + +pcm.cdnhdmi8ch { + type dshare + slave { + pcm "hw:3,0" + channels 8 + } + ipc_key 5144458 + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 + bindings.6 3 + bindings.7 7 +} diff --git a/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf new file mode 100644 index 000000000..0084f4a0b --- /dev/null +++ b/recipes-bsp/alsa-state/alsa-state/imx-nxp-bsp/asound.conf @@ -0,0 +1,271 @@ +defaults.pcm.rate_converter "linear" + +pcm.dmix_48000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.dmix_44100{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.dmix_32000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.dmix_24000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.dmix_22050{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.dmix_16000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.dmix_12000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.dmix_11025{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.dmix_8000{ +type dmix +ipc_key 5678293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.!dsnoop_48000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 48000 +} +} + +pcm.!dsnoop_44100{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 44100 +} +} + +pcm.!dsnoop_32000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 32000 +} +} + +pcm.!dsnoop_24000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 24000 +} +} + +pcm.!dsnoop_22050{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 22050 +} +} + +pcm.!dsnoop_16000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 16000 +} +} + +pcm.!dsnoop_12000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 12000 +} +} + +pcm.!dsnoop_11025{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 11025 +} +} + +pcm.!dsnoop_8000{ +type dsnoop +ipc_key 5778293 +ipc_key_add_uid yes +slave{ +pcm "hw:0,0" +period_time 40000 +format S16_LE +rate 8000 +} +} + +pcm.asymed{ +type asym +playback.pcm "dmix_44100" +capture.pcm "dsnoop_44100" +} + +pcm.dsp0{ +type plug +slave.pcm "asymed" +} + +pcm.!default{ +type plug +route_policy "average" +slave.pcm "asymed" +} + +ctl.!default{ +type hw +card 0 +} + +ctl.mixer0{ +type hw +card 0 +} + +pcm_slave.esai{ + pcm "hw:0,0" + channels 8 + rate 48000 + period_time 40000 +} + +pcm.esaich1to6{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 0 + bindings.1 4 + bindings.2 1 + bindings.3 5 + bindings.4 2 + bindings.5 6 +} + +pcm.esaich78{ + type dshare + ipc_key 5778293 + slave esai + bindings.0 3 + bindings.1 7 +} -- cgit v1.2.3-54-g00ecf