ASoC: Intel: Skylake: Select hda configuration permissively
commit a66f88394a
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>
5.4-rM2-2.2.x-imx-squashed
parent
422c4938f7
commit
6de661f146
|
@ -480,13 +480,8 @@ static struct skl_ssp_clk skl_ssp_clks[] = {
|
|||
static struct snd_soc_acpi_mach *skl_find_hda_machine(struct skl_dev *skl,
|
||||
struct snd_soc_acpi_mach *machines)
|
||||
{
|
||||
struct hdac_bus *bus = skl_to_bus(skl);
|
||||
struct snd_soc_acpi_mach *mach;
|
||||
|
||||
/* check if we have any codecs detected on bus */
|
||||
if (bus->codec_mask == 0)
|
||||
return NULL;
|
||||
|
||||
/* point to common table */
|
||||
mach = snd_soc_acpi_intel_hda_machines;
|
||||
|
||||
|
|
Loading…
Reference in New Issue