| Message ID | 20220602135316.3554400-16-broonie@kernel.org |
|---|---|
| State | Accepted |
| Commit | b9ff35c7afc6ae1bddca3f84fb23a3d903a62a23 |
| Headers | show |
| Series | ASoC: DAI clocking terminology modernisation | expand |
Hi Mark,
I love your patch! Yet something to improve:
[auto build test ERROR on broonie-sound/for-next]
[also build test ERROR on v5.18 next-20220602]
[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/intel-lab-lkp/linux/commits/Mark-Brown/ASoC-DAI-clocking-terminology-modernisation/20220602-220124
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: i386-randconfig-a006 (https://download.01.org/0day-ci/archive/20220603/202206030307.ZnUCVGoC-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project b364c76683f8ef241025a9556300778c07b590c2)
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/intel-lab-lkp/linux/commit/3ef04fe7b323f8132d917a0f3b54ff93e003db5c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Mark-Brown/ASoC-DAI-clocking-terminology-modernisation/20220602-220124
git checkout 3ef04fe7b323f8132d917a0f3b54ff93e003db5c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash sound/soc/codecs/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> sound/soc/codecs/tlv320aic23.c:432:16: error: use of undeclared identifier 'SND_SOC_DAIFMT_CLOCk_PROVIDER_MASK'
switch (fmt & SND_SOC_DAIFMT_CLOCk_PROVIDER_MASK) {
^
1 error generated.
vim +/SND_SOC_DAIFMT_CLOCk_PROVIDER_MASK +432 sound/soc/codecs/tlv320aic23.c
423
424 static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai,
425 unsigned int fmt)
426 {
427 struct snd_soc_component *component = codec_dai->component;
428 u16 iface_reg;
429
430 iface_reg = snd_soc_component_read(component, TLV320AIC23_DIGT_FMT) & (~0x03);
431
> 432 switch (fmt & SND_SOC_DAIFMT_CLOCk_PROVIDER_MASK) {
433 case SND_SOC_DAIFMT_CBP_CFP:
434 iface_reg |= TLV320AIC23_MS_MASTER;
435 break;
436 case SND_SOC_DAIFMT_CBC_CFC:
437 iface_reg &= ~TLV320AIC23_MS_MASTER;
438 break;
439 default:
440 return -EINVAL;
441
442 }
443
444 /* interface format */
445 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
446 case SND_SOC_DAIFMT_I2S:
447 iface_reg |= TLV320AIC23_FOR_I2S;
448 break;
449 case SND_SOC_DAIFMT_DSP_A:
450 iface_reg |= TLV320AIC23_LRP_ON;
451 fallthrough;
452 case SND_SOC_DAIFMT_DSP_B:
453 iface_reg |= TLV320AIC23_FOR_DSP;
454 break;
455 case SND_SOC_DAIFMT_RIGHT_J:
456 break;
457 case SND_SOC_DAIFMT_LEFT_J:
458 iface_reg |= TLV320AIC23_FOR_LJUST;
459 break;
460 default:
461 return -EINVAL;
462
463 }
464
465 snd_soc_component_write(component, TLV320AIC23_DIGT_FMT, iface_reg);
466
467 return 0;
468 }
469
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 2400093e2c99..f0d1c470fbf4 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -429,12 +429,11 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, iface_reg = snd_soc_component_read(component, TLV320AIC23_DIGT_FMT) & (~0x03); - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + switch (fmt & SND_SOC_DAIFMT_CLOCk_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: iface_reg |= TLV320AIC23_MS_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: iface_reg &= ~TLV320AIC23_MS_MASTER; break; default:
As part of moving to remove the old style defines for the bus clocks update the tlv320aic23 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/tlv320aic23.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)