Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9b6567d authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: Enable bytcht_nocodec machine driver



Make sure this machine driver is only used if enabled explicitly
and if there is no information found in the SSDT.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 759db1c4
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -489,7 +489,14 @@ static struct sst_acpi_mach sst_acpi_bytcr[] = {
						&byt_rvp_platform_data },
	{"10EC5648", "cht-bsw-rt5645", "intel/fw_sst_0f28.bin", "cht-bsw", NULL,
						&byt_rvp_platform_data },

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
	/*
	 * This is always last in the table so that it is selected only when
	 * enabled explicitly and there is no codec-related information in SSDT
	 */
	{"80860F28", "bytcht_nocodec", "intel/fw_sst_0f28.bin", "bytcht_nocodec", NULL,
						&byt_rvp_platform_data },
#endif
	{},
};

@@ -520,6 +527,14 @@ static struct sst_acpi_mach sst_acpi_chv[] = {
	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
	{"10EC5651", "bytcr_rt5651", "intel/fw_sst_22a8.bin", "bytcr_rt5651", NULL,
						&chv_platform_data },
#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)
	/*
	 * This is always last in the table so that it is selected only when
	 * enabled explicitly and there is no codec-related information in SSDT
	 */
	{"808622A8", "bytcht_nocodec", "intel/fw_sst_22a8.bin", "bytcht_nocodec", NULL,
						&chv_platform_data },
#endif
	{},
};