Skip to content

Commit 6de661f

Browse files
crojewsk-intelgregkh
authored andcommitted
ASoC: Intel: Skylake: Select hda configuration permissively
commit a66f883 upstream. With _reset_link removed from the probe sequence, codec_mask at the time skl_find_hda_machine() is invoked will always be 0, so hda machine will never be chosen. Rather than reorganizing boot flow, be permissive about invalid mask. codec_mask will be set to proper value during probe_work - before skl_codec_create() ever gets called. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200305145314.32579-3-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Cc: <stable@vger.kernel.org> # 5.4.x Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 422c493 commit 6de661f

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

  • sound/soc/intel/skylake

sound/soc/intel/skylake/skl.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,13 +480,8 @@ static struct skl_ssp_clk skl_ssp_clks[] = {
480480
static struct snd_soc_acpi_mach *skl_find_hda_machine(struct skl_dev *skl,
481481
struct snd_soc_acpi_mach *machines)
482482
{
483-
struct hdac_bus *bus = skl_to_bus(skl);
484483
struct snd_soc_acpi_mach *mach;
485484

486-
/* check if we have any codecs detected on bus */
487-
if (bus->codec_mask == 0)
488-
return NULL;
489-
490485
/* point to common table */
491486
mach = snd_soc_acpi_intel_hda_machines;
492487

0 commit comments

Comments
 (0)