January 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH - alsa-lib 2/3] add surround30 and surround31 definitions
by tom.ty89＠gmail.com 17 Jan '16

17 Jan '16

From: Tom Yan <tom.ty89(a)gmail.com> Signed-off-by: Tom Yan <tom.ty89(a)gmail.com> diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index 2ea7cb0..43cec5d 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -92,6 +92,10 @@ defaults.pcm.side.card defaults.pcm.card defaults.pcm.side.device defaults.pcm.device defaults.pcm.surround21.card defaults.pcm.card defaults.pcm.surround21.device defaults.pcm.device +defaults.pcm.surround30.card defaults.pcm.card +defaults.pcm.surround30.device defaults.pcm.device +defaults.pcm.surround31.card defaults.pcm.card +defaults.pcm.surround31.device defaults.pcm.device defaults.pcm.surround40.card defaults.pcm.card defaults.pcm.surround40.device defaults.pcm.device defaults.pcm.surround41.card defaults.pcm.card @@ -136,6 +140,8 @@ pcm.rear cards.pcm.rear pcm.center_lfe cards.pcm.center_lfe pcm.side cards.pcm.side pcm.surround21 cards.pcm.surround21 +pcm.surround30 cards.pcm.surround30 +pcm.surround31 cards.pcm.surround31 pcm.surround40 cards.pcm.surround40 pcm.surround41 cards.pcm.surround41 pcm.surround50 cards.pcm.surround50 diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf index 42540d6..a125b65 100644 --- a/src/conf/cards/ATIIXP-SPDMA.conf +++ b/src/conf/cards/ATIIXP-SPDMA.conf @@ -78,6 +78,8 @@ ATIIXP-SPDMA.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf index c4d33ef..4e27be6 100644 --- a/src/conf/cards/ATIIXP.conf +++ b/src/conf/cards/ATIIXP.conf @@ -78,6 +78,8 @@ ATIIXP.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf index 1c92496..250192a 100644 --- a/src/conf/cards/Audigy.conf +++ b/src/conf/cards/Audigy.conf @@ -144,6 +144,8 @@ Audigy.pcm.center_lfe.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround40.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> diff --git a/src/conf/cards/Audigy2.conf b/src/conf/cards/Audigy2.conf index e4544a6..fc71866 100644 --- a/src/conf/cards/Audigy2.conf +++ b/src/conf/cards/Audigy2.conf @@ -196,6 +196,8 @@ Audigy2.pcm.side.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround40.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf index 07be4a7..a8be4a7 100644 --- a/src/conf/cards/Aureon51.conf +++ b/src/conf/cards/Aureon51.conf @@ -87,6 +87,8 @@ Aureon51.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf index 1f08b34..474d002 100644 --- a/src/conf/cards/Aureon71.conf +++ b/src/conf/cards/Aureon71.conf @@ -87,6 +87,8 @@ Aureon71.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/CA0106.conf b/src/conf/cards/CA0106.conf index c06adfc..56e8c2d 100644 --- a/src/conf/cards/CA0106.conf +++ b/src/conf/cards/CA0106.conf @@ -109,6 +109,8 @@ CA0106.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf index edc67d4..0623a80 100644 --- a/src/conf/cards/CMI8738-MC6.conf +++ b/src/conf/cards/CMI8738-MC6.conf @@ -78,6 +78,8 @@ CMI8738-MC6.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf index b74e476..b24647c 100644 --- a/src/conf/cards/CMI8738-MC8.conf +++ b/src/conf/cards/CMI8738-MC8.conf @@ -106,6 +106,8 @@ CMI8738-MC8.pcm.surround40.0 { <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/CMI8788.conf b/src/conf/cards/CMI8788.conf index 1d52512..c605b50 100644 --- a/src/conf/cards/CMI8788.conf +++ b/src/conf/cards/CMI8788.conf @@ -49,6 +49,8 @@ CMI8788.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/CS46xx.conf b/src/conf/cards/CS46xx.conf index b71c30a..5321b99 100644 --- a/src/conf/cards/CS46xx.conf +++ b/src/conf/cards/CS46xx.conf @@ -113,6 +113,8 @@ CS46xx.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf index ef193fe..b1ca48b 100644 --- a/src/conf/cards/EMU10K1.conf +++ b/src/conf/cards/EMU10K1.conf @@ -218,6 +218,8 @@ EMU10K1.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/EMU10K1X.conf b/src/conf/cards/EMU10K1X.conf index f742863..ba1b4c2 100644 --- a/src/conf/cards/EMU10K1X.conf +++ b/src/conf/cards/EMU10K1X.conf @@ -97,6 +97,8 @@ EMU10K1X.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/Echo_Echo3G.conf b/src/conf/cards/Echo_Echo3G.conf index 4a29c4e..dc95de6 100644 --- a/src/conf/cards/Echo_Echo3G.conf +++ b/src/conf/cards/Echo_Echo3G.conf @@ -50,6 +50,75 @@ Echo_Echo3G.pcm.side.0 { subdevice 6 } +<confdir:pcm/surround30.conf> +Echo_Echo3G.pcm.surround30.0 { + @args [ CARD ] + @args.CARD { + type string + } + type multi + slaves [ + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD + ] + } + channels 2 + } + ] + bindings [ + { slave 0 channel 0 } + { slave 0 channel 1 } + { slave 1 channel 1 } + ] +} + +<confdir:pcm/surround31.conf> +Echo_Echo3G.pcm.surround31.0 { + @args [ CARD ] + @args.CARD { + type string + } + type multi + slaves [ + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.front.0:CARD=" $CARD + ] + } + channels 2 + } + { + pcm { + @func concat + strings [ + "cards.Echo_Echo3G.pcm.center_lfe.0:CARD=" $CARD + ] + } + channels 2 + } + ] + bindings [ + { slave 0 channel 0 } + { slave 0 channel 1 } + { slave 1 channel 0 } + { slave 1 channel 1 } + ] +} + <confdir:pcm/surround40.conf> Echo_Echo3G.pcm.surround40.0 { @args [ CARD ] diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf index 0ddf799..5152cad 100644 --- a/src/conf/cards/FM801.conf +++ b/src/conf/cards/FM801.conf @@ -41,6 +41,8 @@ FM801.pcm.default { FM801.pcm.surround40.0 "cards.FM801.pcm.front.0" <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/FireWave.conf b/src/conf/cards/FireWave.conf index fcfc83c..d12a7ae 100644 --- a/src/conf/cards/FireWave.conf +++ b/src/conf/cards/FireWave.conf @@ -26,6 +26,8 @@ FireWave.pcm.front.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf index f04fae0..074c664 100644 --- a/src/conf/cards/HDA-Intel.conf +++ b/src/conf/cards/HDA-Intel.conf @@ -72,6 +72,8 @@ HDA-Intel.pcm.default { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround40.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf index 16d793a..0fc2f58 100644 --- a/src/conf/cards/ICE1712.conf +++ b/src/conf/cards/ICE1712.conf @@ -75,6 +75,8 @@ ICE1712.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf index 6072eab..35a3520 100644 --- a/src/conf/cards/ICE1724.conf +++ b/src/conf/cards/ICE1724.conf @@ -96,6 +96,8 @@ ICE1724.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf index 6fc9a5a..25a32e6 100644 --- a/src/conf/cards/ICH.conf +++ b/src/conf/cards/ICH.conf @@ -99,6 +99,8 @@ ICH.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf index 64ec883..160676a 100644 --- a/src/conf/cards/ICH4.conf +++ b/src/conf/cards/ICH4.conf @@ -99,6 +99,8 @@ ICH4.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/Loopback.conf b/src/conf/cards/Loopback.conf index ab76670..7f40d21 100644 --- a/src/conf/cards/Loopback.conf +++ b/src/conf/cards/Loopback.conf @@ -64,6 +64,8 @@ Loopback.pcm.default { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround40.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf index 4ccf58e..ef025d5 100644 --- a/src/conf/cards/NFORCE.conf +++ b/src/conf/cards/NFORCE.conf @@ -99,6 +99,8 @@ NFORCE.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/SB-XFi.conf b/src/conf/cards/SB-XFi.conf index 25fe7b7..d524dff 100644 --- a/src/conf/cards/SB-XFi.conf +++ b/src/conf/cards/SB-XFi.conf @@ -54,6 +54,8 @@ SB-XFi.pcm.side.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround40.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf index 02b8fc8..16954dd 100644 --- a/src/conf/cards/SI7018.conf +++ b/src/conf/cards/SI7018.conf @@ -79,6 +79,8 @@ SI7018.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index c8a21c5..68dd482 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -329,6 +329,8 @@ USB-Audio.pcm.surround40_two_stereo_devices { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf index 9ad321f..d8fa05f 100644 --- a/src/conf/cards/VIA8233.conf +++ b/src/conf/cards/VIA8233.conf @@ -87,6 +87,8 @@ VIA8233.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf index 679fccf..5cde142 100644 --- a/src/conf/cards/VIA8233A.conf +++ b/src/conf/cards/VIA8233A.conf @@ -85,6 +85,8 @@ VIA8233A.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf index 29d8e00..d04c5c1 100644 --- a/src/conf/cards/VIA8237.conf +++ b/src/conf/cards/VIA8237.conf @@ -80,6 +80,8 @@ VIA8237.pcm.surround40.0 { } <confdir:pcm/surround21.conf> +<confdir:pcm/surround30.conf> +<confdir:pcm/surround31.conf> <confdir:pcm/surround41.conf> <confdir:pcm/surround50.conf> <confdir:pcm/surround51.conf> diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am index b1f87fe..745d47e 100644 --- a/src/conf/pcm/Makefile.am +++ b/src/conf/pcm/Makefile.am @@ -1,7 +1,9 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\ - surround21.conf surround40.conf surround41.conf \ - surround50.conf surround51.conf surround70.conf \ - surround71.conf iec958.conf hdmi.conf modem.conf \ + surround21.conf surround30.conf surround31.conf \ + surround40.conf surround41.conf \ + surround50.conf surround51.conf \ + surround70.conf surround71.conf \ + iec958.conf hdmi.conf modem.conf \ dmix.conf dsnoop.conf \ dpl.conf diff --git a/src/conf/pcm/surround30.conf b/src/conf/pcm/surround30.conf new file mode 100644 index 0000000..8172d95 --- /dev/null +++ b/src/conf/pcm/surround30.conf @@ -0,0 +1,61 @@ +# +# Hardware output from 3.0 speakers. +# Samples must be positioned: +# chn0 - front left +# chn1 - front right +# chn2 - center +# + +pcm.!surround30 { + @args [ CARD DEV ] + @args.CARD { + type string + default { + @func getenv + vars [ + ALSA_SURROUND30_CARD + ALSA_PCM_CARD + ALSA_CARD + ] + default { + @func refer + name defaults.pcm.surround30.card + } + } + } + @args.DEV { + type integer + default { + @func igetenv + vars [ + ALSA_SURROUND30_DEVICE + ] + default { + @func refer + name defaults.pcm.surround30.device + } + } + } + type route + slave.pcm { + @func refer + name { + @func concat + strings [ + "cards." + { + @func card_driver + card $CARD + } + ".pcm.surround51." $DEV ":CARD=" $CARD + ] + } + } + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.FC 1 + hint { + description "3.0 Surround output to Front and Center speakers" + device $DEV + } +} diff --git a/src/conf/pcm/surround31.conf b/src/conf/pcm/surround31.conf new file mode 100644 index 0000000..67d8e14 --- /dev/null +++ b/src/conf/pcm/surround31.conf @@ -0,0 +1,63 @@ +# +# Hardware output from 3.1 speakers. +# Samples must be positioned: +# chn0 - front left +# chn1 - front right +# chn2 - center +# chn3 - LFE +# + +pcm.!surround31 { + @args [ CARD DEV ] + @args.CARD { + type string + default { + @func getenv + vars [ + ALSA_SURROUND31_CARD + ALSA_PCM_CARD + ALSA_CARD + ] + default { + @func refer + name defaults.pcm.surround31.card + } + } + } + @args.DEV { + type integer + default { + @func igetenv + vars [ + ALSA_SURROUND31_DEVICE + ] + default { + @func refer + name defaults.pcm.surround31.device + } + } + } + type route + slave.pcm { + @func refer + name { + @func concat + strings [ + "cards." + { + @func card_driver + card $CARD + } + ".pcm.surround51." $DEV ":CARD=" $CARD + ] + } + } + ttable.0.FL 1 + ttable.1.FR 1 + ttable.2.FC 1 + ttable.3.LFE 1 + hint { + description "3.1 Surround output to Front, Center and Subwoofer speakers" + device $DEV + } +} -- 2.7.0

1 0

[alsa-devel] Should we get rid of {surround21/surround41/surround50}.conf from alsa-lib?
by Tom Yan 17 Jan '16

17 Jan '16

What I mean is, should we really by default set up PCMs that provide a SUBSET of POSSIBLE channel configurations that IS BUILT and RELYS ON ttable? [tom@localhost ~]$ grep ttable /usr/share/alsa/pcm/surround* /usr/share/alsa/pcm/surround21.conf: ttable.0.FL 1 /usr/share/alsa/pcm/surround21.conf: ttable.1.FR 1 /usr/share/alsa/pcm/surround21.conf: ttable.2.LFE 1 /usr/share/alsa/pcm/surround41.conf: ttable.0.FL 1 /usr/share/alsa/pcm/surround41.conf: ttable.1.FR 1 /usr/share/alsa/pcm/surround41.conf: ttable.2.RL 1 /usr/share/alsa/pcm/surround41.conf: ttable.3.RR 1 /usr/share/alsa/pcm/surround41.conf: ttable.4.LFE 1 /usr/share/alsa/pcm/surround50.conf: ttable.0.FL 1 /usr/share/alsa/pcm/surround50.conf: ttable.1.FR 1 /usr/share/alsa/pcm/surround50.conf: ttable.2.RL 1 /usr/share/alsa/pcm/surround50.conf: ttable.3.RR 1 /usr/share/alsa/pcm/surround50.conf: ttable.4.FC 1 If we are really gonna provide them, why only these 3? What about: surround30 (surround51 - RL - RR - LFE) surround31 (surround51 - RL - RR) surround60 (surround71 - FC - LFE, corresponds to surround40) surround61 (surround71 - FC, corresponds to surround41) surround70 (surround71 - LFE, corresponds to surround 50) surround30 more or less corresponds to surround50 as well, and surround31 doesn't even have the weirdness of using only either one channel in the C/Sub port like the others.

1 2

[alsa-devel] [PATCH] ASoC: wm8741: Fix (and refactor) volume controls
by Sergej Sawazki 16 Jan '16

16 Jan '16

The attenuation UPDATE bits were not handled correctly on volume updates. Fix this by implementing volume control .get and .put callbacks. Furthermore, the DAC has two attenuation registers (LSB and MSB) per channel. Hide this details from the user and provide a single volume control widget (with proper dB scale) per channel. Signed-off-by: Sergej Sawazki <ce3a(a)gmx.de> --- sound/soc/codecs/wm8741.c | 90 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 36ef91f..cd3edc0 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -61,33 +61,95 @@ static const struct reg_default wm8741_reg_defaults[] = { { 32, 0x0002 }, /* R32 - ADDITONAL_CONTROL_1 */ }; +static unsigned int _wm8741_volume_get(struct snd_soc_codec *codec, + struct soc_mixer_control *mc, unsigned int lsb_reg) +{ + unsigned int msb_reg = lsb_reg + 1; + unsigned int mask = mc->max; + unsigned int val = (snd_soc_read(codec, lsb_reg) | + (snd_soc_read(codec, msb_reg) << mc->shift)) & mask; + + if (mc->invert) + val = mc->max - val; + + return val; +} + +static int _wm8741_volume_set(struct snd_soc_codec *codec, + struct soc_mixer_control *mc, unsigned int lsb_reg, + unsigned int val) +{ + unsigned int msb_reg = lsb_reg + 1; + unsigned int upd = (1 << mc->shift); + unsigned int mask = upd - 1; + + if (mc->invert) + val = mc->max - val; + + snd_soc_write(codec, lsb_reg, val & mask); + snd_soc_write(codec, msb_reg, (val >> mc->shift) | upd); + + return 0; +} + static int wm8741_reset(struct snd_soc_codec *codec) { return snd_soc_write(codec, WM8741_RESET, 0); } -static const DECLARE_TLV_DB_SCALE(dac_tlv_fine, -12700, 13, 0); -static const DECLARE_TLV_DB_SCALE(dac_tlv, -12700, 400, 0); +static int wm8741_volume_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + + ucontrol->value.integer.value[0] = + _wm8741_volume_get(codec, mc, mc->reg); + + if (snd_soc_volsw_is_stereo(mc)) + ucontrol->value.integer.value[1] = + _wm8741_volume_get(codec, mc, mc->rreg); + + return 0; +} + +static int wm8741_volume_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + + _wm8741_volume_set(codec, mc, mc->reg, + ucontrol->value.integer.value[0]); + + if (snd_soc_volsw_is_stereo(mc)) + _wm8741_volume_set(codec, mc, mc->rreg, + ucontrol->value.integer.value[1]); + + return 0; +} + +static const DECLARE_TLV_DB_MINMAX_MUTE(wm8741_vol_tlv, -12788, 0); static const struct snd_kcontrol_new wm8741_snd_controls_stereo[] = { -SOC_DOUBLE_R_TLV("Fine Playback Volume", WM8741_DACLLSB_ATTENUATION, - WM8741_DACRLSB_ATTENUATION, 1, 255, 1, dac_tlv_fine), -SOC_DOUBLE_R_TLV("Playback Volume", WM8741_DACLMSB_ATTENUATION, - WM8741_DACRMSB_ATTENUATION, 0, 511, 1, dac_tlv), +SOC_DOUBLE_R_EXT_TLV("Playback Volume", + WM8741_DACLLSB_ATTENUATION, WM8741_DACRLSB_ATTENUATION, + WM8741_UPDATELL_SHIFT, 0x3ff, 1, + wm8741_volume_get, wm8741_volume_set, wm8741_vol_tlv), }; static const struct snd_kcontrol_new wm8741_snd_controls_mono_left[] = { -SOC_SINGLE_TLV("Fine Playback Volume", WM8741_DACLLSB_ATTENUATION, - 1, 255, 1, dac_tlv_fine), -SOC_SINGLE_TLV("Playback Volume", WM8741_DACLMSB_ATTENUATION, - 0, 511, 1, dac_tlv), +SOC_SINGLE_EXT_TLV("Playback Volume", WM8741_DACLLSB_ATTENUATION, + WM8741_UPDATELL_SHIFT, 0x3ff, 1, + wm8741_volume_get, wm8741_volume_set, wm8741_vol_tlv), }; static const struct snd_kcontrol_new wm8741_snd_controls_mono_right[] = { -SOC_SINGLE_TLV("Fine Playback Volume", WM8741_DACRLSB_ATTENUATION, - 1, 255, 1, dac_tlv_fine), -SOC_SINGLE_TLV("Playback Volume", WM8741_DACRMSB_ATTENUATION, - 0, 511, 1, dac_tlv), +SOC_SINGLE_EXT_TLV("Playback Volume", WM8741_DACRLSB_ATTENUATION, + WM8741_UPDATERL_SHIFT, 0x3ff, 1, + wm8741_volume_get, wm8741_volume_set, wm8741_vol_tlv), }; static const struct snd_soc_dapm_widget wm8741_dapm_widgets[] = { -- 2.5.0

2 1

[alsa-devel] [PATCH 0/4] ASoC: fix saif record unwork issue
by Dong Aisheng 16 Jan '16

16 Jan '16

This patch series mainly fixes the saif record unwork issue. The root cause consists of: 1) clk_prepare and clk_enable un-balanced 2) missed setting a proper initial clock rate for saif in dt 3) sgtl5000 dapm widget kcontrol does not work So can not test record on mx28evk. 4) missed setting clkmux mode for saif in dt With this patch series it can fix sgtl5000 widget kcontrol unwork and saif record unwork issue. BTW, just let people konw, i still met a few overruns during record, that's another issue and will be fixed in separte patches later. Patch based on sound-2.6/for-3.6. Dong Aisheng (4): ASoC: mxs-saif: fix clock prepare and enable unbalance issue ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe ARM: mx28evk: add missed clkmux select for saif arch/arm/mach-mxs/mach-mxs.c | 3 +++ sound/soc/codecs/sgtl5000.c | 2 -- sound/soc/mxs/mxs-saif.c | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-)

5 20

[alsa-devel] [patch] ASoC: AMD: free memory on error
by Dan Carpenter 15 Jan '16

15 Jan '16

Static checkers complain if we don't free "adata" before returning. Fixes: 7c31335a03b6 ('ASoC: AMD: add AMD ASoC ACP 2.x DMA driver') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 3191e0a..d1fb035 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -635,6 +635,7 @@ static int acp_dma_open(struct snd_pcm_substream *substream) SNDRV_PCM_HW_PARAM_PERIODS); if (ret < 0) { dev_err(prtd->platform->dev, "set integer constraint failed\n"); + kfree(adata); return ret; }

2 1

[alsa-devel] [PATCH 1/2] ASoC: rt5659: Staticise rt5659_i2c_shutdown
by Axel Lin 15 Jan '16

15 Jan '16

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/rt5659.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index 820d8fa..47c717f4 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -4184,7 +4184,7 @@ static int rt5659_i2c_remove(struct i2c_client *i2c) return 0; } -void rt5659_i2c_shutdown(struct i2c_client *client) +static void rt5659_i2c_shutdown(struct i2c_client *client) { struct rt5659_priv *rt5659 = i2c_get_clientdata(client); -- 2.1.4

2 3

[alsa-devel] [PATCH v2] ASoC: mediatek: Enable 33bit memory address to support 4GB DRAM
by PC Liao 15 Jan '16

15 Jan '16

If platform is embedded with memory more than 3GB, the address will go out of the scope that 32-bit can handle with. This patch sets the dma_mask and MSB properly to describe its address to 33-bit. Signed-off-by: Hidalgo Huang <hidalgo.huang(a)mediatek.com> Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- Changes since v1: Use upper_32_bits() and lower_32_bits() to change the code. --- sound/soc/mediatek/mtk-afe-common.h | 1 + sound/soc/mediatek/mtk-afe-pcm.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mtk-afe-common.h b/sound/soc/mediatek/mtk-afe-common.h index 9b1af1a..f341f62 100644 --- a/sound/soc/mediatek/mtk-afe-common.h +++ b/sound/soc/mediatek/mtk-afe-common.h @@ -87,6 +87,7 @@ struct mtk_afe_memif_data { int irq_en_shift; int irq_fs_shift; int irq_clr_shift; + int msb_shift; }; struct mtk_afe_memif { diff --git a/sound/soc/mediatek/mtk-afe-pcm.c b/sound/soc/mediatek/mtk-afe-pcm.c index 08af9f5..689c51f 100644 --- a/sound/soc/mediatek/mtk-afe-pcm.c +++ b/sound/soc/mediatek/mtk-afe-pcm.c @@ -21,6 +21,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <sound/soc.h> #include "mtk-afe-common.h" @@ -35,6 +36,7 @@ #define AFE_I2S_CON1 0x0034 #define AFE_I2S_CON2 0x0038 #define AFE_CONN_24BIT 0x006c +#define AFE_MEMIF_MSB 0x00cc #define AFE_CONN1 0x0024 #define AFE_CONN2 0x0028 @@ -592,6 +594,7 @@ static int mtk_afe_dais_hw_params(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct mtk_afe *afe = snd_soc_platform_get_drvdata(rtd->platform); struct mtk_afe_memif *memif = &afe->memif[rtd->cpu_dai->id]; + int msb_at_bit33 = 0; int ret; dev_dbg(afe->dev, @@ -603,7 +606,8 @@ static int mtk_afe_dais_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - memif->phys_buf_addr = substream->runtime->dma_addr; + msb_at_bit33 = upper_32_bits(substream->runtime->dma_addr) ? 1 : 0; + memif->phys_buf_addr = lower_32_bits(substream->runtime->dma_addr); memif->buffer_size = substream->runtime->dma_bytes; /* start */ @@ -614,6 +618,11 @@ static int mtk_afe_dais_hw_params(struct snd_pcm_substream *substream, memif->data->reg_ofs_base + AFE_BASE_END_OFFSET, memif->phys_buf_addr + memif->buffer_size - 1); + /* set MSB to 33-bit */ + regmap_update_bits(afe->regmap, AFE_MEMIF_MSB, + 1 << memif->data->msb_shift, + msb_at_bit33 << memif->data->msb_shift); + /* set channel */ if (memif->data->mono_shift >= 0) { unsigned int mono = (params_channels(params) == 1) ? 1 : 0; @@ -978,6 +987,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 0, .irq_fs_shift = 4, .irq_clr_shift = 0, + .msb_shift = 0, }, { .name = "DL2", .id = MTK_AFE_MEMIF_DL2, @@ -991,6 +1001,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 2, .irq_fs_shift = 16, .irq_clr_shift = 2, + .msb_shift = 1, }, { .name = "VUL", .id = MTK_AFE_MEMIF_VUL, @@ -1004,6 +1015,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 1, .irq_fs_shift = 8, .irq_clr_shift = 1, + .msb_shift = 6, }, { .name = "DAI", .id = MTK_AFE_MEMIF_DAI, @@ -1017,6 +1029,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 3, .irq_fs_shift = 20, .irq_clr_shift = 3, + .msb_shift = 5, }, { .name = "AWB", .id = MTK_AFE_MEMIF_AWB, @@ -1030,6 +1043,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 14, .irq_fs_shift = 24, .irq_clr_shift = 6, + .msb_shift = 3, }, { .name = "MOD_DAI", .id = MTK_AFE_MEMIF_MOD_DAI, @@ -1043,6 +1057,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 3, .irq_fs_shift = 20, .irq_clr_shift = 3, + .msb_shift = 4, }, { .name = "HDMI", .id = MTK_AFE_MEMIF_HDMI, @@ -1056,6 +1071,7 @@ static const struct mtk_afe_memif_data memif_data[MTK_AFE_MEMIF_NUM] = { .irq_en_shift = 12, .irq_fs_shift = -1, .irq_clr_shift = 4, + .msb_shift = 8, }, }; @@ -1189,6 +1205,10 @@ static int mtk_afe_pcm_dev_probe(struct platform_device *pdev) struct mtk_afe *afe; struct resource *res; + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(33)); + if (ret) + return ret; + afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL); if (!afe) return -ENOMEM; -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: mediatek: add i2c dependency
by Arnd Bergmann 15 Jan '16

15 Jan '16

The newly added mediatek drivers for mt8173 select codes that depend on I2C, which cuases a build failure if I2C is disabled: warning: (SND_SOC_ADAU1761_I2C && SND_SOC_ADAU1781_I2C && SND_SOC_ADAU1977_I2C && SND_SOC_RT5677 && EXTCON_MAX14577 && EXTCON_MAX77693 && EXTCON_MAX77843 && BMC150_ACCEL_I2C && BMG160_I2C) selects REGMAP_I2C which has unmet direct dependencies (I2C) codecs/rt5645.c:3854:1: warning: data definition has no type or storage class codecs/rt5645.c:3854:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] codecs/rt5677.c:5270:1: warning: data definition has no type or storage class 77_i2c_driver); codecs/rt5677.c:5270:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] This adds an explicit dependency. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 15c04e2eae34..976967675387 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -9,7 +9,7 @@ config SND_SOC_MEDIATEK config SND_SOC_MT8173_MAX98090 tristate "ASoC Audio driver for MT8173 with MAX98090 codec" - depends on SND_SOC_MEDIATEK + depends on SND_SOC_MEDIATEK && I2C select SND_SOC_MAX98090 help This adds ASoC driver for Mediatek MT8173 boards @@ -19,7 +19,7 @@ config SND_SOC_MT8173_MAX98090 config SND_SOC_MT8173_RT5650_RT5676 tristate "ASoC Audio driver for MT8173 with RT5650 RT5676 codecs" - depends on SND_SOC_MEDIATEK + depends on SND_SOC_MEDIATEK && I2C select SND_SOC_RT5645 select SND_SOC_RT5677 help

3 2

[alsa-devel] Applied "ASoC: fsl: document DT compatible string "fsl, imx-audio-wm8960"" to the asoc tree
by Mark Brown 15 Jan '16

15 Jan '16

The patch ASoC: fsl: document DT compatible string "fsl,imx-audio-wm8960" has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 2935bf43ef12a8d68b96776ec11155cfa120cb0d Mon Sep 17 00:00:00 2001 From: Xiubo Li <lixiubo(a)cmss.chinamobile.com> Date: Fri, 15 Jan 2016 13:33:08 +0800 Subject: [PATCH] ASoC: fsl: document DT compatible string "fsl,imx-audio-wm8960" The devicetree compatible string "fsl,imx-audio-wm8960" for fsl-asoc-card is missing. Signed-off-by: Xiubo Li <lixiubo(a)cmss.chinamobile.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index ce55c0a6f757..4da41bf1888e 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: "fsl,imx-audio-sgtl5000" (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt) + "fsl,imx-audio-wm8960" + Required properties: - compatible : Contains one of entries in the compatible list. -- 2.7.0.rc3

1 0

[alsa-devel] [PATCH 1/2] ALSA: timer: Harden slave timer list handling
by Takashi Iwai 15 Jan '16

15 Jan '16

A slave timer instance might be still accessible in a racy way while operating the master instance as it lacks of locking. Since the master operation is mostly protected with timer->lock, we should cope with it while changing the slave instance, too. Also, some linked lists (active_list and ack_list) of slave instances aren't unlinked immediately at stopping or closing, and this may lead to unexpected accesses. This patch tries to address these issues. It adds spin lock of timer->lock (either from master or slave, which is equivalent) in a few places. For avoiding a deadlock, we ensure that the global slave_active_lock is always locked at first before each timer lock. Also, ack and active_list of slave instances are properly unlinked at snd_timer_stop() and snd_timer_close(). Last but not least, remove the superfluous call of _snd_timer_stop() at removing slave links. This is a noop, and calling it may confuse readers wrt locking. Further cleanup will follow in a later patch. Actually we've got reports of use-after-free by syzkaller fuzzer, and this hopefully fixes these issues. Reported-by: Dmitry Vyukov <dvyukov(a)google.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/timer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index 3810ee8f1205..4e8d7bfffff6 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -215,11 +215,13 @@ static void snd_timer_check_master(struct snd_timer_instance *master) slave->slave_id == master->slave_id) { list_move_tail(&slave->open_list, &master->slave_list_head); spin_lock_irq(&slave_active_lock); + spin_lock(&master->timer->lock); slave->master = master; slave->timer = master->timer; if (slave->flags & SNDRV_TIMER_IFLG_RUNNING) list_add_tail(&slave->active_list, &master->slave_active_head); + spin_unlock(&master->timer->lock); spin_unlock_irq(&slave_active_lock); } } @@ -346,15 +348,18 @@ int snd_timer_close(struct snd_timer_instance *timeri) timer->hw.close) timer->hw.close(timer); /* remove slave links */ + spin_lock_irq(&slave_active_lock); + spin_lock(&timer->lock); list_for_each_entry_safe(slave, tmp, &timeri->slave_list_head, open_list) { - spin_lock_irq(&slave_active_lock); - _snd_timer_stop(slave, 1, SNDRV_TIMER_EVENT_RESOLUTION); list_move_tail(&slave->open_list, &snd_timer_slave_list); slave->master = NULL; slave->timer = NULL; - spin_unlock_irq(&slave_active_lock); + list_del_init(&slave->ack_list); + list_del_init(&slave->active_list); } + spin_unlock(&timer->lock); + spin_unlock_irq(&slave_active_lock); mutex_unlock(&register_mutex); } out: @@ -441,9 +446,12 @@ static int snd_timer_start_slave(struct snd_timer_instance *timeri) spin_lock_irqsave(&slave_active_lock, flags); timeri->flags |= SNDRV_TIMER_IFLG_RUNNING; - if (timeri->master) + if (timeri->master && timeri->timer) { + spin_lock(&timeri->timer->lock); list_add_tail(&timeri->active_list, &timeri->master->slave_active_head); + spin_unlock(&timeri->timer->lock); + } spin_unlock_irqrestore(&slave_active_lock, flags); return 1; /* delayed start */ } @@ -489,6 +497,8 @@ static int _snd_timer_stop(struct snd_timer_instance * timeri, if (!keep_flag) { spin_lock_irqsave(&slave_active_lock, flags); timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING; + list_del_init(&timeri->ack_list); + list_del_init(&timeri->active_list); spin_unlock_irqrestore(&slave_active_lock, flags); } goto __end; -- 2.7.0

1 1