November 2020 - Alsa-devel - mailman.alsa-project.org

[sound:test/usb-hacks 14/20] sound/usb/pcm.c:579:35: warning: variable 'altsd' set but not used
by kernel test robot 10 Nov '20

10 Nov '20

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git test/usb-hacks head: 2adedc89c82670019ee3b016d2a2237176768e3a commit: 7502ae0cddc65ab020cd3c3dc4085f3e70f70f21 [14/20] ALSA: usb-audio: Track implicit fb sync endpoint in audioformat list config: mips-randconfig-r025-20201110 (attached as .config) compiler: mips-linux-gcc (GCC) 9.3.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=… git remote add sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git git fetch --no-tags sound test/usb-hacks git checkout 7502ae0cddc65ab020cd3c3dc4085f3e70f70f21 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=mips If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> All warnings (new ones prefixed by >>): sound/usb/pcm.c: In function 'set_format': >> sound/usb/pcm.c:579:35: warning: variable 'altsd' set but not used [-Wunused-but-set-variable] 579 | struct usb_interface_descriptor *altsd; | ^~~~~ vim +/altsd +579 sound/usb/pcm.c 71bb64c56d787a2 Eldad Zack 2013-08-03 571 71bb64c56d787a2 Eldad Zack 2013-08-03 572 /* 71bb64c56d787a2 Eldad Zack 2013-08-03 573 * find a matching format and set up the interface 71bb64c56d787a2 Eldad Zack 2013-08-03 574 */ 71bb64c56d787a2 Eldad Zack 2013-08-03 575 static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) 71bb64c56d787a2 Eldad Zack 2013-08-03 576 { 71bb64c56d787a2 Eldad Zack 2013-08-03 577 struct usb_device *dev = subs->dev; 71bb64c56d787a2 Eldad Zack 2013-08-03 578 struct usb_host_interface *alts; 71bb64c56d787a2 Eldad Zack 2013-08-03 @579 struct usb_interface_descriptor *altsd; 71bb64c56d787a2 Eldad Zack 2013-08-03 580 struct usb_interface *iface; 71bb64c56d787a2 Eldad Zack 2013-08-03 581 int err; 71bb64c56d787a2 Eldad Zack 2013-08-03 582 71bb64c56d787a2 Eldad Zack 2013-08-03 583 iface = usb_ifnum_to_if(dev, fmt->iface); 71bb64c56d787a2 Eldad Zack 2013-08-03 584 if (WARN_ON(!iface)) 71bb64c56d787a2 Eldad Zack 2013-08-03 585 return -EINVAL; b099b9693d23d03 Takashi Iwai 2018-05-02 586 alts = usb_altnum_to_altsetting(iface, fmt->altsetting); 0141254b0a74b37 Johan Hovold 2019-12-20 587 if (WARN_ON(!alts)) 71bb64c56d787a2 Eldad Zack 2013-08-03 588 return -EINVAL; 0141254b0a74b37 Johan Hovold 2019-12-20 589 altsd = get_iface_desc(alts); 71bb64c56d787a2 Eldad Zack 2013-08-03 590 92adc96f8eecd95 Hui Wang 2019-12-18 591 if (fmt == subs->cur_audiofmt && !subs->need_setup_fmt) 71bb64c56d787a2 Eldad Zack 2013-08-03 592 return 0; 71bb64c56d787a2 Eldad Zack 2013-08-03 593 71bb64c56d787a2 Eldad Zack 2013-08-03 594 /* close the old interface */ 92adc96f8eecd95 Hui Wang 2019-12-18 595 if (subs->interface >= 0 && (subs->interface != fmt->iface || subs->need_setup_fmt)) { 8a463225b110474 Takashi Iwai 2018-05-02 596 if (!subs->stream->chip->keep_iface) { 71bb64c56d787a2 Eldad Zack 2013-08-03 597 err = usb_set_interface(subs->dev, subs->interface, 0); 71bb64c56d787a2 Eldad Zack 2013-08-03 598 if (err < 0) { 0ba41d917eeb87f Takashi Iwai 2014-02-26 599 dev_err(&dev->dev, 0ba41d917eeb87f Takashi Iwai 2014-02-26 600 "%d:%d: return to setting 0 failed (%d)\n", 0ba41d917eeb87f Takashi Iwai 2014-02-26 601 fmt->iface, fmt->altsetting, err); 71bb64c56d787a2 Eldad Zack 2013-08-03 602 return -EIO; 71bb64c56d787a2 Eldad Zack 2013-08-03 603 } 8a463225b110474 Takashi Iwai 2018-05-02 604 } 71bb64c56d787a2 Eldad Zack 2013-08-03 605 subs->interface = -1; 71bb64c56d787a2 Eldad Zack 2013-08-03 606 subs->altset_idx = 0; 71bb64c56d787a2 Eldad Zack 2013-08-03 607 } 71bb64c56d787a2 Eldad Zack 2013-08-03 608 92adc96f8eecd95 Hui Wang 2019-12-18 609 if (subs->need_setup_fmt) 92adc96f8eecd95 Hui Wang 2019-12-18 610 subs->need_setup_fmt = false; 92adc96f8eecd95 Hui Wang 2019-12-18 611 71bb64c56d787a2 Eldad Zack 2013-08-03 612 /* set interface */ b099b9693d23d03 Takashi Iwai 2018-05-02 613 if (iface->cur_altsetting != alts) { 6874daad4b0fbed Jurgen Kramer 2014-11-28 614 err = snd_usb_select_mode_quirk(subs, fmt); 6874daad4b0fbed Jurgen Kramer 2014-11-28 615 if (err < 0) 6874daad4b0fbed Jurgen Kramer 2014-11-28 616 return -EIO; 6874daad4b0fbed Jurgen Kramer 2014-11-28 617 71bb64c56d787a2 Eldad Zack 2013-08-03 618 err = usb_set_interface(dev, fmt->iface, fmt->altsetting); 71bb64c56d787a2 Eldad Zack 2013-08-03 619 if (err < 0) { 0ba41d917eeb87f Takashi Iwai 2014-02-26 620 dev_err(&dev->dev, 0ba41d917eeb87f Takashi Iwai 2014-02-26 621 "%d:%d: usb_set_interface failed (%d)\n", 0ba41d917eeb87f Takashi Iwai 2014-02-26 622 fmt->iface, fmt->altsetting, err); 71bb64c56d787a2 Eldad Zack 2013-08-03 623 return -EIO; 71bb64c56d787a2 Eldad Zack 2013-08-03 624 } 0ba41d917eeb87f Takashi Iwai 2014-02-26 625 dev_dbg(&dev->dev, "setting usb interface %d:%d\n", 71bb64c56d787a2 Eldad Zack 2013-08-03 626 fmt->iface, fmt->altsetting); 71bb64c56d787a2 Eldad Zack 2013-08-03 627 snd_usb_set_interface_quirk(dev); 71bb64c56d787a2 Eldad Zack 2013-08-03 628 } 71bb64c56d787a2 Eldad Zack 2013-08-03 629 b099b9693d23d03 Takashi Iwai 2018-05-02 630 subs->interface = fmt->iface; b099b9693d23d03 Takashi Iwai 2018-05-02 631 subs->altset_idx = fmt->altset_idx; 71bb64c56d787a2 Eldad Zack 2013-08-03 632 subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip, 71bb64c56d787a2 Eldad Zack 2013-08-03 633 alts, fmt->endpoint, subs->direction, 71bb64c56d787a2 Eldad Zack 2013-08-03 634 SND_USB_ENDPOINT_TYPE_DATA); 71bb64c56d787a2 Eldad Zack 2013-08-03 635 71bb64c56d787a2 Eldad Zack 2013-08-03 636 if (!subs->data_endpoint) 71bb64c56d787a2 Eldad Zack 2013-08-03 637 return -EINVAL; 71bb64c56d787a2 Eldad Zack 2013-08-03 638 7502ae0cddc65ab Takashi Iwai 2020-11-05 639 err = set_sync_endpoint(subs, fmt); 71bb64c56d787a2 Eldad Zack 2013-08-03 640 if (err < 0) 71bb64c56d787a2 Eldad Zack 2013-08-03 641 return err; 71bb64c56d787a2 Eldad Zack 2013-08-03 642 d133f2c22e9cb7b Eldad Zack 2013-08-03 643 err = snd_usb_init_pitch(subs->stream->chip, fmt->iface, alts, fmt); d133f2c22e9cb7b Eldad Zack 2013-08-03 644 if (err < 0) e5779998bf8b70e Daniel Mack 2010-03-04 645 return err; e5779998bf8b70e Daniel Mack 2010-03-04 646 e5779998bf8b70e Daniel Mack 2010-03-04 647 subs->cur_audiofmt = fmt; e5779998bf8b70e Daniel Mack 2010-03-04 648 e5779998bf8b70e Daniel Mack 2010-03-04 649 snd_usb_set_format_quirk(subs, fmt); e5779998bf8b70e Daniel Mack 2010-03-04 650 e5779998bf8b70e Daniel Mack 2010-03-04 651 return 0; e5779998bf8b70e Daniel Mack 2010-03-04 652 } e5779998bf8b70e Daniel Mack 2010-03-04 653 :::::: The code at line 579 was first introduced by commit :::::: 71bb64c56d787a221752b1de034fe8c07c737f5c ALSA: usb-audio: separate sync endpoint setting from set_format :::::: TO: Eldad Zack <eldad(a)fogrefinery.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[sound:test/usb-hacks 14/20] sound/usb/pcm.c:579:35: warning: variable 'altsd' set but not used
by kernel test robot 10 Nov '20

10 Nov '20

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git test/usb-hacks head: 2adedc89c82670019ee3b016d2a2237176768e3a commit: 7502ae0cddc65ab020cd3c3dc4085f3e70f70f21 [14/20] ALSA: usb-audio: Track implicit fb sync endpoint in audioformat list config: i386-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=… git remote add sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git git fetch --no-tags sound test/usb-hacks git checkout 7502ae0cddc65ab020cd3c3dc4085f3e70f70f21 # save the attached .config to linux build tree make W=1 ARCH=i386 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> All warnings (new ones prefixed by >>): sound/usb/pcm.c: In function 'set_format': >> sound/usb/pcm.c:579:35: warning: variable 'altsd' set but not used [-Wunused-but-set-variable] 579 | struct usb_interface_descriptor *altsd; | ^~~~~ vim +/altsd +579 sound/usb/pcm.c 71bb64c56d787a Eldad Zack 2013-08-03 571 71bb64c56d787a Eldad Zack 2013-08-03 572 /* 71bb64c56d787a Eldad Zack 2013-08-03 573 * find a matching format and set up the interface 71bb64c56d787a Eldad Zack 2013-08-03 574 */ 71bb64c56d787a Eldad Zack 2013-08-03 575 static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) 71bb64c56d787a Eldad Zack 2013-08-03 576 { 71bb64c56d787a Eldad Zack 2013-08-03 577 struct usb_device *dev = subs->dev; 71bb64c56d787a Eldad Zack 2013-08-03 578 struct usb_host_interface *alts; 71bb64c56d787a Eldad Zack 2013-08-03 @579 struct usb_interface_descriptor *altsd; 71bb64c56d787a Eldad Zack 2013-08-03 580 struct usb_interface *iface; 71bb64c56d787a Eldad Zack 2013-08-03 581 int err; 71bb64c56d787a Eldad Zack 2013-08-03 582 71bb64c56d787a Eldad Zack 2013-08-03 583 iface = usb_ifnum_to_if(dev, fmt->iface); 71bb64c56d787a Eldad Zack 2013-08-03 584 if (WARN_ON(!iface)) 71bb64c56d787a Eldad Zack 2013-08-03 585 return -EINVAL; b099b9693d23d0 Takashi Iwai 2018-05-02 586 alts = usb_altnum_to_altsetting(iface, fmt->altsetting); 0141254b0a74b3 Johan Hovold 2019-12-20 587 if (WARN_ON(!alts)) 71bb64c56d787a Eldad Zack 2013-08-03 588 return -EINVAL; 0141254b0a74b3 Johan Hovold 2019-12-20 589 altsd = get_iface_desc(alts); 71bb64c56d787a Eldad Zack 2013-08-03 590 92adc96f8eecd9 Hui Wang 2019-12-18 591 if (fmt == subs->cur_audiofmt && !subs->need_setup_fmt) 71bb64c56d787a Eldad Zack 2013-08-03 592 return 0; 71bb64c56d787a Eldad Zack 2013-08-03 593 71bb64c56d787a Eldad Zack 2013-08-03 594 /* close the old interface */ 92adc96f8eecd9 Hui Wang 2019-12-18 595 if (subs->interface >= 0 && (subs->interface != fmt->iface || subs->need_setup_fmt)) { 8a463225b11047 Takashi Iwai 2018-05-02 596 if (!subs->stream->chip->keep_iface) { 71bb64c56d787a Eldad Zack 2013-08-03 597 err = usb_set_interface(subs->dev, subs->interface, 0); 71bb64c56d787a Eldad Zack 2013-08-03 598 if (err < 0) { 0ba41d917eeb87 Takashi Iwai 2014-02-26 599 dev_err(&dev->dev, 0ba41d917eeb87 Takashi Iwai 2014-02-26 600 "%d:%d: return to setting 0 failed (%d)\n", 0ba41d917eeb87 Takashi Iwai 2014-02-26 601 fmt->iface, fmt->altsetting, err); 71bb64c56d787a Eldad Zack 2013-08-03 602 return -EIO; 71bb64c56d787a Eldad Zack 2013-08-03 603 } 8a463225b11047 Takashi Iwai 2018-05-02 604 } 71bb64c56d787a Eldad Zack 2013-08-03 605 subs->interface = -1; 71bb64c56d787a Eldad Zack 2013-08-03 606 subs->altset_idx = 0; 71bb64c56d787a Eldad Zack 2013-08-03 607 } 71bb64c56d787a Eldad Zack 2013-08-03 608 92adc96f8eecd9 Hui Wang 2019-12-18 609 if (subs->need_setup_fmt) 92adc96f8eecd9 Hui Wang 2019-12-18 610 subs->need_setup_fmt = false; 92adc96f8eecd9 Hui Wang 2019-12-18 611 71bb64c56d787a Eldad Zack 2013-08-03 612 /* set interface */ b099b9693d23d0 Takashi Iwai 2018-05-02 613 if (iface->cur_altsetting != alts) { 6874daad4b0fbe Jurgen Kramer 2014-11-28 614 err = snd_usb_select_mode_quirk(subs, fmt); 6874daad4b0fbe Jurgen Kramer 2014-11-28 615 if (err < 0) 6874daad4b0fbe Jurgen Kramer 2014-11-28 616 return -EIO; 6874daad4b0fbe Jurgen Kramer 2014-11-28 617 71bb64c56d787a Eldad Zack 2013-08-03 618 err = usb_set_interface(dev, fmt->iface, fmt->altsetting); 71bb64c56d787a Eldad Zack 2013-08-03 619 if (err < 0) { 0ba41d917eeb87 Takashi Iwai 2014-02-26 620 dev_err(&dev->dev, 0ba41d917eeb87 Takashi Iwai 2014-02-26 621 "%d:%d: usb_set_interface failed (%d)\n", 0ba41d917eeb87 Takashi Iwai 2014-02-26 622 fmt->iface, fmt->altsetting, err); 71bb64c56d787a Eldad Zack 2013-08-03 623 return -EIO; 71bb64c56d787a Eldad Zack 2013-08-03 624 } 0ba41d917eeb87 Takashi Iwai 2014-02-26 625 dev_dbg(&dev->dev, "setting usb interface %d:%d\n", 71bb64c56d787a Eldad Zack 2013-08-03 626 fmt->iface, fmt->altsetting); 71bb64c56d787a Eldad Zack 2013-08-03 627 snd_usb_set_interface_quirk(dev); 71bb64c56d787a Eldad Zack 2013-08-03 628 } 71bb64c56d787a Eldad Zack 2013-08-03 629 b099b9693d23d0 Takashi Iwai 2018-05-02 630 subs->interface = fmt->iface; b099b9693d23d0 Takashi Iwai 2018-05-02 631 subs->altset_idx = fmt->altset_idx; 71bb64c56d787a Eldad Zack 2013-08-03 632 subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip, 71bb64c56d787a Eldad Zack 2013-08-03 633 alts, fmt->endpoint, subs->direction, 71bb64c56d787a Eldad Zack 2013-08-03 634 SND_USB_ENDPOINT_TYPE_DATA); 71bb64c56d787a Eldad Zack 2013-08-03 635 71bb64c56d787a Eldad Zack 2013-08-03 636 if (!subs->data_endpoint) 71bb64c56d787a Eldad Zack 2013-08-03 637 return -EINVAL; 71bb64c56d787a Eldad Zack 2013-08-03 638 7502ae0cddc65a Takashi Iwai 2020-11-05 639 err = set_sync_endpoint(subs, fmt); 71bb64c56d787a Eldad Zack 2013-08-03 640 if (err < 0) 71bb64c56d787a Eldad Zack 2013-08-03 641 return err; 71bb64c56d787a Eldad Zack 2013-08-03 642 d133f2c22e9cb7 Eldad Zack 2013-08-03 643 err = snd_usb_init_pitch(subs->stream->chip, fmt->iface, alts, fmt); d133f2c22e9cb7 Eldad Zack 2013-08-03 644 if (err < 0) e5779998bf8b70 Daniel Mack 2010-03-04 645 return err; e5779998bf8b70 Daniel Mack 2010-03-04 646 e5779998bf8b70 Daniel Mack 2010-03-04 647 subs->cur_audiofmt = fmt; e5779998bf8b70 Daniel Mack 2010-03-04 648 e5779998bf8b70 Daniel Mack 2010-03-04 649 snd_usb_set_format_quirk(subs, fmt); e5779998bf8b70 Daniel Mack 2010-03-04 650 e5779998bf8b70 Daniel Mack 2010-03-04 651 return 0; e5779998bf8b70 Daniel Mack 2010-03-04 652 } e5779998bf8b70 Daniel Mack 2010-03-04 653 :::::: The code at line 579 was first introduced by commit :::::: 71bb64c56d787a221752b1de034fe8c07c737f5c ALSA: usb-audio: separate sync endpoint setting from set_format :::::: TO: Eldad Zack <eldad(a)fogrefinery.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[PATCH AUTOSEL 4.19 02/21] ALSA: hda: Reinstate runtime_allow() for all hda controllers
by Sasha Levin 10 Nov '20

10 Nov '20

From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> [ Upstream commit 9fc149c3bce7bdbb94948a8e6bd025e3b3538603 ] The broken jack detection should be fixed by commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), let's try enabling runtime PM by default again. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Link: https://lore.kernel.org/r/20201027130038.16463-4-kai.heng.feng@canonical.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/pci/hda/hda_intel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index d43245937db7e..8e1eb5f243a27 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2478,6 +2478,7 @@ static int azx_probe_continue(struct azx *chip) if (azx_has_pm_runtime(chip)) { pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_allow(&pci->dev); pm_runtime_put_autosuspend(&pci->dev); } -- 2.27.0

1 0

[PATCH AUTOSEL 5.4 01/42] ASoC: qcom: sdm845: set driver name correctly
by Sasha Levin 10 Nov '20

10 Nov '20

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> [ Upstream commit 3f48b6eba15ea342ef4cb420b580f5ed6605669f ] With the current state of code, we would endup with something like below in /proc/asound/cards for 2 machines based on this driver. Machine 1: 0 [DB845c ]: DB845c - DB845c DB845c Machine 2: 0 [LenovoYOGAC6301]: Lenovo-YOGA-C63 - Lenovo-YOGA-C630-13Q50 LENOVO-81JL-LenovoYOGAC630_13Q50-LNVNB161216 This is not very UCM friendly both w.r.t to common up configs and card identification, and UCM2 became totally not usefull with just one ucm sdm845.conf for two machines which have different setups w.r.t HDMI and other dais. Reasons for such thing is partly because Qualcomm machine drivers never cared to set driver_name. This patch sets up driver name for the this driver to sort out the UCM integration issues! after this patch contents of /proc/asound/cards: Machine 1: 0 [DB845c ]: sdm845 - DB845c DB845c Machine 2: 0 [LenovoYOGAC6301]: sdm845 - Lenovo-YOGA-C630-13Q50 LENOVO-81JL-LenovoYOGAC630_13Q50-LNVNB161216 with this its possible to align with what UCM2 expects and we can have sdm845/DB845.conf sdm845/LENOVO-81JL-LenovoYOGAC630_13Q50-LNVNB161216.conf ... for board variants. This should scale much better! Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20201023095849.22894-1-srinivas.kandagatla@linaro… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/qcom/sdm845.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 7e6c41e63d8e1..23e1de61e92e4 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -16,6 +16,7 @@ #include "qdsp6/q6afe.h" #include "../codecs/rt5663.h" +#define DRIVER_NAME "sdm845" #define DEFAULT_SAMPLE_RATE_48K 48000 #define DEFAULT_MCLK_RATE 24576000 #define TDM_BCLK_RATE 6144000 @@ -407,6 +408,7 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) goto data_alloc_fail; } + card->driver_name = DRIVER_NAME; card->dapm_widgets = sdm845_snd_widgets; card->num_dapm_widgets = ARRAY_SIZE(sdm845_snd_widgets); card->dev = dev; -- 2.27.0

1 3

[PATCH AUTOSEL 5.9 01/55] ASoC: mediatek: mt8183-da7219: fix DAPM paths for rt1015
by Sasha Levin 10 Nov '20

10 Nov '20

From: Tzung-Bi Shih <tzungbi(a)google.com> [ Upstream commit eb5a558705c7f63d06b4ddd072898b1ca894e053 ] RT1015's output widget name is "SPO" instead of "Speaker". Fixes it to use the correct names. Signed-off-by: Tzung-Bi Shih <tzungbi(a)google.com> Link: https://lore.kernel.org/r/20201019044724.1601476-1-tzungbi@google.com Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- .../mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index a6c690c5308d3..58b76e985f7f3 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -624,15 +624,34 @@ static struct snd_soc_codec_conf mt8183_da7219_rt1015_codec_conf[] = { }, }; +static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = { + SOC_DAPM_PIN_SWITCH("Left Spk"), + SOC_DAPM_PIN_SWITCH("Right Spk"), +}; + +static const +struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = { + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), + SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL", + "aud_tdm_out_on", "aud_tdm_out_off"), +}; + +static const struct snd_soc_dapm_route mt8183_da7219_rt1015_dapm_routes[] = { + {"Left Spk", NULL, "Left SPO"}, + {"Right Spk", NULL, "Right SPO"}, + {"I2S Playback", NULL, "TDM_OUT_PINCTRL"}, +}; + static struct snd_soc_card mt8183_da7219_rt1015_card = { .name = "mt8183_da7219_rt1015", .owner = THIS_MODULE, - .controls = mt8183_da7219_max98357_snd_controls, - .num_controls = ARRAY_SIZE(mt8183_da7219_max98357_snd_controls), - .dapm_widgets = mt8183_da7219_max98357_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_max98357_dapm_widgets), - .dapm_routes = mt8183_da7219_max98357_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_max98357_dapm_routes), + .controls = mt8183_da7219_rt1015_snd_controls, + .num_controls = ARRAY_SIZE(mt8183_da7219_rt1015_snd_controls), + .dapm_widgets = mt8183_da7219_rt1015_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_widgets), + .dapm_routes = mt8183_da7219_rt1015_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_routes), .dai_link = mt8183_da7219_dai_links, .num_links = ARRAY_SIZE(mt8183_da7219_dai_links), .aux_dev = &mt8183_da7219_max98357_headset_dev, -- 2.27.0

1 5

ASoC: Question regarding device-tree multi-lane I2S for Allwinner SoC
by Clément Péron 09 Nov '20

09 Nov '20

Hi device-tree and sound Maintainers, I have a question regarding multi-lane i2S representation. On the Allwinner SoC the I2S/PCM Interface can handle up to four lanes as output or input. For each lane we can enable up to sixteen slots. And for each output slot we can choose which slot to map. The only representation I found is for Amlogic device-tree they did the following sound node : /* 8ch hdmi interface */ dai-link-7 { sound-dai = <&tdmif_b>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; dai-tdm-slot-tx-mask-1 = <1 1>; dai-tdm-slot-tx-mask-2 = <1 1>; dai-tdm-slot-tx-mask-3 = <1 1>; mclk-fs = <256>; codec { sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; }; }; This kind of representation gives the information that 2 slots should be enabled as TX per lane but don't give which slot to map. I was thinking about a representation per lane but maybe it's a bit complicated ? dai-format = "dsp_a"; dai-tdm-slot-width = <32>; // Lane 0 : Output 8 channels 0-7 using TDM dai-tdm-slot-tx-mask-0 = <1 1 1 1 1 1 1 1>; dai-tdm-slot-chmap-0 = <0 1 2 3 4 5 6 7>; // Lane 1 : Output 3 channels 5-7 using TDM dai-tdm-slot-tx-mask-1 = <1 1 1>; dai-tdm-slot-chmap-1 = <5 6 7>; I will only start to support HDMI, so 4 I2S lanes for now it should look like this dai-format = "i2s"; dai-tdm-slot-width = <32>; frame-inversion; // Lane 0 : Output channels 0,1 dai-tdm-slot-tx-mask-0 = <1 1>; dai-tdm-slot-chmap-0 = <0 1>; // Lane 1: Output channels 2,3 dai-tdm-slot-tx-mask-1 = <1 1>; dai-tdm-slot-chmap-1 = <2 3>; // Lane 2: Output channels 4,5 dai-tdm-slot-tx-mask-2 = <1 1>; dai-tdm-slot-chmap-2 = <4 5>; // Lane 3: Output channels 6,7 dai-tdm-slot-tx-mask-3 = <1 1>; dai-tdm-slot-chmap-3 = <6 7>; What do you think? Do you have any remark / idea about this ? Thanks for your help Clement

2 1

USB Audio device: Shure MV7 not recognized
by GitHub issues - edited 09 Nov '20

09 Nov '20

alsa-project/alsa-lib issue #98 was edited from vchuravy: Hello! i hope this is the right venue for reporting not working audio devices. ``` > alsa-capabilities 9: `USB Audio' Digital USB Audio Class audio output on device Shure MV7 -hardware address: hw:3,0 (or hw:MV7,0) -device label: Shure MV7 -formats: (n/a) -usb audio class: UAC2 (isochronous asynchronous) -streamfile: /proc/asound/card3/stream0 -character device: /dev/snd/pcmC3D0p -monitor file: /proc/asound/card3/pcm0p/sub0/hw_params ``` `alsa-info.sh`: http://alsa-project.org/db/?f=7bfa1d9ac09aac53a52834e95b833d299dfe3896 `pulseaudio -vvv` https://gist.github.com/vchuravy/f5f8ee972d5e2179387c8c53423379f6 During the pulseaudio session I plugged the device in and then unplugged it. I am happy to dig in, but I would need some guidance on where to start. As a side-note the microphone seems to work on Android so I am wondering if they are using a different driver. The device has a head-phone jack with feedback from the mic, and without pulseaudio running I hear the microphone inputs. So I was wondering if this was in particular a pulseaudio issue. ``` > arecord -l **** List of CAPTURE Hardware Devices **** card 1: Generic [HD-Audio Generic], device 0: ALCS1200A Analog [ALCS1200A Analog] Subdevices: 0/1 Subdevice #0: subdevice #0 card 1: Generic [HD-Audio Generic], device 2: ALCS1200A Alt Analog [ALCS1200A Alt Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 2: C925e [Logitech Webcam C925e], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 card 3: MV7 [Shure MV7], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 > arecord -d 3 -f U8 sample.mp3 ALSA lib pcm_dsnoop.c:638:(snd_pcm_dsnoop_open) unable to open slave arecord: main:830: audio open error: No such file or directory ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/98 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

USB Audio device: Shure MV7 not recognized
by GitHub issues - edited 09 Nov '20

09 Nov '20

alsa-project/alsa-lib issue #98 was edited from vchuravy: Hello! i hope this is the right venue for reporting not working audio devices. ``` > alsa-capabilities 9: `USB Audio' Digital USB Audio Class audio output on device Shure MV7 -hardware address: hw:3,0 (or hw:MV7,0) -device label: Shure MV7 -formats: (n/a) -usb audio class: UAC2 (isochronous asynchronous) -streamfile: /proc/asound/card3/stream0 -character device: /dev/snd/pcmC3D0p -monitor file: /proc/asound/card3/pcm0p/sub0/hw_params ``` `alsa-info.sh`: http://alsa-project.org/db/?f=7bfa1d9ac09aac53a52834e95b833d299dfe3896 `pulseaudio -vvv` https://gist.github.com/vchuravy/f5f8ee972d5e2179387c8c53423379f6 During the pulseaudio session I plugged the device in and then unplugged it. I am happy to dig in, but I would need some guidance on where to start. As a side-note the microphone seems to work on Android so I am wondering if they are using a different driver. Issue URL : https://github.com/alsa-project/alsa-lib/issues/98 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

USB Audio device: Shure MV7 not recognized
by GitHub issues - opened 09 Nov '20

09 Nov '20

alsa-project/alsa-lib issue #98 was opened from vchuravy: Hello! i hope this is the right venue for reporting not working audio devices. ``` > alsa-capabilities 9: `USB Audio' Digital USB Audio Class audio output on device Shure MV7 -hardware address: hw:3,0 (or hw:MV7,0) -device label: Shure MV7 -formats: (n/a) -usb audio class: UAC2 (isochronous asynchronous) -streamfile: /proc/asound/card3/stream0 -character device: /dev/snd/pcmC3D0p -monitor file: /proc/asound/card3/pcm0p/sub0/hw_params ``` `alsa-info.sh`: http://alsa-project.org/db/?f=1fb51d03454930fce4d6164323cfb7b3c7c88dda `pulseaudio -vvv` https://gist.github.com/vchuravy/f5f8ee972d5e2179387c8c53423379f6 During the pulseaudio session I plugged the device in and then unplugged it. I am happy to dig in, but I would need some guidance on where to start. As a side-note the microphone seems to work on Android so I am wondering if they are using a different driver. Issue URL : https://github.com/alsa-project/alsa-lib/issues/98 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: qcom: sc7180: Add missing PM ops
by Cheng-Yi Chiang 09 Nov '20

09 Nov '20

Use PM ops snd_soc_pm_ops to handle suspend/resume like other machine drivers. Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/qcom/sc7180.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index b391f64c3a80..42e366ecc689 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -258,6 +258,7 @@ static struct platform_driver sc7180_snd_driver = { .driver = { .name = "msm-snd-sc7180", .of_match_table = sc7180_snd_device_id, + .pm = &snd_soc_pm_ops, }, }; module_platform_driver(sc7180_snd_driver); -- 2.29.2.222.g5d2a92d10f8-goog

2 1