1. 20 Apr, 2020 9 commits
    • Wei Li's avatar
      ASoC: Fix wrong dependency of da7210 and wm8983 · c1c050ee
      Wei Li authored
      As these two drivers support I2C and SPI, we should add the SND_SOC_I2C_AND_SPI
      dependency instead.
      
      Fixes: ce0c97f8 ("ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout")
      Signed-off-by: default avatarWei Li <liwei391@huawei.com>
      Link: https://lore.kernel.org/r/20200420202410.47327-3-liwei391@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      c1c050ee
    • Wei Li's avatar
      ASoC: wm89xx: Fix build errors caused by I2C dependency · 91e475b5
      Wei Li authored
      When I2C=m, SND_SOC_WM8900=y, SND_SOC_WM8988=y, SND_SOC_WM8995=y:
      
      sound/soc/codecs/wm8900.o: In function `wm8900_i2c_probe':
      wm8900.c:(.text+0xa16): undefined reference to `__devm_regmap_init_i2c'
      sound/soc/codecs/wm8900.o: In function `wm8900_modinit':
      wm8900.c:(.init.text+0xb): undefined reference to `i2c_register_driver'
      sound/soc/codecs/wm8900.o: In function `wm8900_exit':
      wm8900.c:(.exit.text+0x8): undefined reference to `i2c_del_driver'
      sound/soc/codecs/wm8988.o: In function `wm8988_i2c_probe':
      wm8988.c:(.text+0x86b): undefined reference to `__devm_regmap_init_i2c'
      sound/soc/codecs/wm8988.o: In function `wm8988_modinit':
      wm8988.c:(.init.text+0xb): undefined reference to `i2c_register_driver'
      sound/soc/codecs/wm8988.o: In function `wm8988_exit':
      wm8988.c:(.exit.text+0x8): undefined reference to `i2c_del_driver'
      sound/soc/codecs/wm8995.o: In function `wm8995_i2c_probe':
      wm8995.c:(.text+0x1b5b): undefined reference to `__devm_regmap_init_i2c'
      sound/soc/codecs/wm8995.o: In function `wm8995_modinit':
      wm8995.c:(.init.text+0xb): undefined reference to `i2c_register_driver'
      sound/soc/codecs/wm8995.o: In function `wm8995_exit':
      wm8995.c:(.exit.text+0x8): undefined reference to `i2c_del_driver'
      
      As these drivers support I2C and SPI, we add the SND_SOC_I2C_AND_SPI
      dependency to solve it.
      
      Fixes: ea00d952 ("ASoC: Use imply for SND_SOC_ALL_CODECS")
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarWei Li <liwei391@huawei.com>
      Link: https://lore.kernel.org/r/20200420202410.47327-2-liwei391@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      91e475b5
    • Mark Brown's avatar
      Merge series "ASoC: rsnd: multi-SSI setup fixes" from Matthias Blankertz... · bce32169
      Mark Brown authored
      Merge series "ASoC: rsnd: multi-SSI setup fixes" from Matthias Blankertz <matthias.blankertz@cetitec.com>:
      
      Fix rsnd_dai_call() operations being performed twice for the master SSI
      in multi-SSI setups, and fix the rsnd_ssi_stop operation for multi-SSI
      setups.
      The only visible effect of these issues was some "status check failed"
      spam when the rsnd_ssi_stop was called, but overall the code is cleaner
      now, and some questionable writes to the SSICR register which did not
      lead to any observable misbehaviour but were contrary to the datasheet
      are fixed.
      
      Mark:
      The first patch kind of reverts my "ASoC: rsnd: Fix parent SSI
      start/stop in multi-SSI mode" from a few days ago and achieves the same
      effect in a simpler fashion, if you would prefer a clean patch series
      based on v5.6 drop me a note.
      
      Greetings,
      	Matthias
      
      Matthias Blankertz (2):
        ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent
        ASoC: rsnd: Fix "status check failed" spam for multi-SSI
      
       sound/soc/sh/rcar/ssi.c | 18 +++++++++++++-----
       1 file changed, 13 insertions(+), 5 deletions(-)
      
      base-commit: 15a5760c
      --
      2.26.1
      bce32169
    • Mark Brown's avatar
      Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet... · 036889b2
      Mark Brown authored
      Merge series "ASoC: meson: fix codec-to-codec link setup" from Jerome Brunet <jbrunet@baylibre.com>:
      
      This patchset fixes the problem reported by Marc in this thread [0]
      The problem was due to an error in the meson card drivers which had
      the "no_pcm" dai_link property set on codec-to-codec links
      
      [0]: https://lore.kernel.org/r/20200417122732.GC5315@sirena.org.uk
      
      Jerome Brunet (2):
        ASoC: meson: axg-card: fix codec-to-codec link setup
        ASoC: meson: gx-card: fix codec-to-codec link setup
      
       sound/soc/meson/axg-card.c | 4 +++-
       sound/soc/meson/gx-card.c  | 4 +++-
       2 files changed, 6 insertions(+), 2 deletions(-)
      
      --
      2.25.2
      036889b2
    • Gyeongtaek Lee's avatar
      ASoC: dapm: fixup dapm kcontrol widget · ebf14747
      Gyeongtaek Lee authored
      snd_soc_dapm_kcontrol widget which is created by autodisable control
      should contain correct on_val, mask and shift because it is set when the
      widget is powered and changed value is applied on registers by following
      code in dapm_seq_run_coalesced().
      
      		mask |= w->mask << w->shift;
      		if (w->power)
      			value |= w->on_val << w->shift;
      		else
      			value |= w->off_val << w->shift;
      
      Shift on the mask in dapm_kcontrol_data_alloc() is removed to prevent
      double shift.
      And, on_val in dapm_kcontrol_set_value() is modified to get correct
      value in the dapm_seq_run_coalesced().
      Signed-off-by: default avatarGyeongtaek Lee <gt82.lee@samsung.com>
      Cc: stable@vger.kernel.org
      Link: https://lore.kernel.org/r/000001d61537$b212f620$1638e260$@samsung.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      ebf14747
    • Matthias Blankertz's avatar
      ASoC: rsnd: Fix "status check failed" spam for multi-SSI · 54cb6221
      Matthias Blankertz authored
      Fix the rsnd_ssi_stop function to skip disabling the individual SSIs of
      a multi-SSI setup, as the actual stop is performed by rsnd_ssiu_stop_gen2
      - the same logic as in rsnd_ssi_start. The attempt to disable these SSIs
      was harmless, but caused a "status check failed" message to be printed
      for every SSI in the multi-SSI setup.
      The disabling of interrupts is still performed, as they are enabled for
      all SSIs in rsnd_ssi_init, but care is taken to not accidentally set the
      EN bit for an SSI where it was not set by rsnd_ssi_start.
      Signed-off-by: default avatarMatthias Blankertz <matthias.blankertz@cetitec.com>
      Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Link: https://lore.kernel.org/r/20200417153017.1744454-3-matthias.blankertz@cetitec.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      54cb6221
    • Matthias Blankertz's avatar
      ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent · 0c258657
      Matthias Blankertz authored
      The master SSI of a multi-SSI setup was attached both to the
      RSND_MOD_SSI slot and the RSND_MOD_SSIP slot of the rsnd_dai_stream.
      This is not correct wrt. the meaning of being "parent" in the rest of
      the SSI code, where it seems to indicate an SSI that provides clock and
      word sync but is not transmitting/receiving audio data.
      
      Not treating the multi-SSI master as parent allows removal of various
      special cases to the rsnd_ssi_is_parent conditions introduced in commit
      a09fb3f2 ("ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode").
      It also fixes the issue that operations performed via rsnd_dai_call()
      were performed twice for the master SSI. This caused some "status check
      failed" spam when stopping a multi-SSI stream as the driver attempted to
      stop the master SSI twice.
      Signed-off-by: default avatarMatthias Blankertz <matthias.blankertz@cetitec.com>
      Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Link: https://lore.kernel.org/r/20200417153017.1744454-2-matthias.blankertz@cetitec.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      0c258657
    • Jerome Brunet's avatar
      ASoC: meson: gx-card: fix codec-to-codec link setup · de911b4e
      Jerome Brunet authored
      Since the addition of commit 9b5db059 ("ASoC: soc-pcm: dpcm: Only allow
      playback/capture if supported"), meson-axg cards which have codec-to-codec
      links fail to init and Oops.
      
        Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128
        Internal error: Oops: 96000044 [#1] PREEMPT SMP
        CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1
        pc : invalidate_paths_ep+0x30/0xe0
        lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8
        Call trace:
         invalidate_paths_ep+0x30/0xe0
         snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8
         dpcm_path_get+0x38/0xd0
         dpcm_fe_dai_open+0x70/0x920
         snd_pcm_open_substream+0x564/0x840
         snd_pcm_open+0xfc/0x228
         snd_pcm_capture_open+0x4c/0x78
         snd_open+0xac/0x1a8
         ...
      
      While this error was initially reported the axg-card type, it also applies
      to the gx-card type.
      
      While initiliazing the links, ASoC treats the codec-to-codec links of this
      card type as a DPCM backend. This error eventually leads to the Oops.
      
      Most of the card driver code is shared between DPCM backends and
      codec-to-codec links. The property "no_pcm" marking DCPM BE was left set on
      codec-to-codec links, leading to this problem. This commit fixes that.
      
      Fixes: e37a0c31 ("ASoC: meson: gx: add sound card support")
      Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
      Link: https://lore.kernel.org/r/20200420114511.450560-3-jbrunet@baylibre.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      de911b4e
    • Jerome Brunet's avatar
      ASoC: meson: axg-card: fix codec-to-codec link setup · 11642842
      Jerome Brunet authored
      Since the addition of commit 9b5db059 ("ASoC: soc-pcm: dpcm: Only allow
      playback/capture if supported"), meson-axg cards which have codec-to-codec
      links fail to init and Oops:
      
        Unable to handle kernel NULL pointer dereference at virtual address 0000000000000128
        Internal error: Oops: 96000044 [#1] PREEMPT SMP
        CPU: 3 PID: 1582 Comm: arecord Not tainted 5.7.0-rc1
        pc : invalidate_paths_ep+0x30/0xe0
        lr : snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8
        Call trace:
         invalidate_paths_ep+0x30/0xe0
         snd_soc_dapm_dai_get_connected_widgets+0x170/0x1a8
         dpcm_path_get+0x38/0xd0
         dpcm_fe_dai_open+0x70/0x920
         snd_pcm_open_substream+0x564/0x840
         snd_pcm_open+0xfc/0x228
         snd_pcm_capture_open+0x4c/0x78
         snd_open+0xac/0x1a8
         ...
      
      While initiliazing the links, ASoC treats the codec-to-codec links of this
      card type as a DPCM backend. This error eventually leads to the Oops.
      
      Most of the card driver code is shared between DPCM backends and
      codec-to-codec links. The property "no_pcm" marking DCPM BE was left set on
      codec-to-codec links, leading to this problem. This commit fixes that.
      
      Fixes: 0a8f1117 ("ASoC: meson: axg-card: add basic codec-to-codec link support")
      Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
      Link: https://lore.kernel.org/r/20200420114511.450560-2-jbrunet@baylibre.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
      11642842
  2. 17 Apr, 2020 2 commits
  3. 16 Apr, 2020 4 commits
  4. 15 Apr, 2020 5 commits
  5. 14 Apr, 2020 16 commits
  6. 09 Apr, 2020 4 commits