[PATCH] ASoC: bt-sco: fix bt-sco-pcm-wb dai widget don't connect to the endpoint
This patch fix the second dai driver's dai widget can't connect to the endpoint. Because "bt-sco-pcm" and "bt-sco-pcm-wb" dai driver have the same stream_name, so it will cause they have the same widget name. Therefor it will just create only one route when do snd_soc_dapm_add_route that only find the widget through the widget name.
Signed-off-by: Jiaxin Yu jiaxin.yu@mediatek.com ---
Hi maintainter,
Need your comments. The patch is the one that I think it makes the mose sense. Maybe we can define the new stream_name for "bt-sco-pcm-wb" and add the new route.
sound/soc/codecs/bt-sco.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c index 4d286844e3c8..578f9df2a25e 100644 --- a/sound/soc/codecs/bt-sco.c +++ b/sound/soc/codecs/bt-sco.c @@ -13,11 +13,16 @@ static const struct snd_soc_dapm_widget bt_sco_widgets[] = { SND_SOC_DAPM_INPUT("RX"), SND_SOC_DAPM_OUTPUT("TX"), + SND_SOC_DAPM_AIF_IN("BT_SCO_RX", "Playback", 0, + SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_OUT("BT_SCO_TX", "Capture", 0, + SND_SOC_NOPM, 0, 0), };
static const struct snd_soc_dapm_route bt_sco_routes[] = { - { "Capture", NULL, "RX" }, - { "TX", NULL, "Playback" }, + { "BT_SCO_TX", NULL, "RX" }, + { "TX", NULL, "BT_SCO_RX" }, +}; };
static struct snd_soc_dai_driver bt_sco_dai[] = {
Hi Jiaxin,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on broonie-sound/for-next] [also build test ERROR on v5.17-rc6 next-20220301] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jiaxin-Yu/ASoC-bt-sco-fix-bt-sco-pc... base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: hexagon-randconfig-r045-20220301 (https://download.01.org/0day-ci/archive/20220302/202203020332.YsOHk7De-lkp@i...) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project d271fc04d5b97b12e6b797c6067d3c96a8d7470e) 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://github.com/0day-ci/linux/commit/de4d22036c32b5b4be162ace0b3ce74c193c... git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Jiaxin-Yu/ASoC-bt-sco-fix-bt-sco-pcm-wb-dai-widget-don-t-connect-to-the-endpoint/20220302-011344 git checkout de4d22036c32b5b4be162ace0b3ce74c193c43c0 # save the config file to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash sound/soc/codecs/
If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot lkp@intel.com
All errors (new ones prefixed by >>):
sound/soc/codecs/bt-sco.c:26:1: error: extraneous closing brace ('}')
}; ^ 1 error generated.
vim +26 sound/soc/codecs/bt-sco.c
5195ca4902fe0b Mark Brown 2013-08-19 21 5195ca4902fe0b Mark Brown 2013-08-19 22 static const struct snd_soc_dapm_route bt_sco_routes[] = { de4d22036c32b5 Jiaxin Yu 2022-03-02 23 { "BT_SCO_TX", NULL, "RX" }, de4d22036c32b5 Jiaxin Yu 2022-03-02 24 { "TX", NULL, "BT_SCO_RX" }, de4d22036c32b5 Jiaxin Yu 2022-03-02 25 }; 5195ca4902fe0b Mark Brown 2013-08-19 @26 }; 5195ca4902fe0b Mark Brown 2013-08-19 27
--- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hi Jiaxin,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on broonie-sound/for-next] [also build test ERROR on v5.17-rc6 next-20220301] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jiaxin-Yu/ASoC-bt-sco-fix-bt-sco-pc... base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: arm-randconfig-r014-20220301 (https://download.01.org/0day-ci/archive/20220302/202203020422.oME8VbcM-lkp@i...) compiler: arm-linux-gnueabi-gcc (GCC) 11.2.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://github.com/0day-ci/linux/commit/de4d22036c32b5b4be162ace0b3ce74c193c... git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Jiaxin-Yu/ASoC-bt-sco-fix-bt-sco-pcm-wb-dai-widget-don-t-connect-to-the-endpoint/20220302-011344 git checkout de4d22036c32b5b4be162ace0b3ce74c193c43c0 # save the config file to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash sound/soc/codecs/
If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot lkp@intel.com
All errors (new ones prefixed by >>):
sound/soc/codecs/bt-sco.c:26:1: error: expected identifier or '(' before '}' token
26 | }; | ^
vim +26 sound/soc/codecs/bt-sco.c
5195ca4902fe0b Mark Brown 2013-08-19 21 5195ca4902fe0b Mark Brown 2013-08-19 22 static const struct snd_soc_dapm_route bt_sco_routes[] = { de4d22036c32b5 Jiaxin Yu 2022-03-02 23 { "BT_SCO_TX", NULL, "RX" }, de4d22036c32b5 Jiaxin Yu 2022-03-02 24 { "TX", NULL, "BT_SCO_RX" }, de4d22036c32b5 Jiaxin Yu 2022-03-02 25 }; 5195ca4902fe0b Mark Brown 2013-08-19 @26 }; 5195ca4902fe0b Mark Brown 2013-08-19 27
--- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
participants (2)
-
Jiaxin Yu -
kernel test robot