ASoC: SOF: Intel: hda: remove SND_SOC_SOF_HDA_COMMON_HDMI_CODEC
To help user-space with HDMI codec driver transition, both
a kernel module parameter and a kernel option were initially
provided to configure default behaviour of SOF on Intel hardware
with commit 139c7febad
("ASoC: SOF: Intel: add support for
snd-hda-codec-hdmi").
As hdac-hdmi is already now lagging in features compared to
snd-hda-codec-hdmi, move ahead with the transition and remove
the build option to select between the two, and instead default
to snd-hda-codec-hdmi if it is enabled in kernel build.
The old behaviour of using hdac-hdmi driver can still be forced
via the kernel module parameter.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200312194859.4051-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
15a5a89597
commit
42c67753ca
@ -324,17 +324,6 @@ config SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1
|
|||||||
Say Y if you want to enable DMI Link L1
|
Say Y if you want to enable DMI Link L1
|
||||||
If unsure, select "N".
|
If unsure, select "N".
|
||||||
|
|
||||||
config SND_SOC_SOF_HDA_COMMON_HDMI_CODEC
|
|
||||||
bool "SOF common HDA HDMI codec driver"
|
|
||||||
depends on SND_SOC_SOF_HDA_LINK
|
|
||||||
depends on SND_HDA_CODEC_HDMI
|
|
||||||
default SND_HDA_CODEC_HDMI
|
|
||||||
help
|
|
||||||
This adds support for HDMI audio by using the common HDA
|
|
||||||
HDMI/DisplayPort codec driver.
|
|
||||||
Say Y if you want to use the common codec driver with SOF.
|
|
||||||
If unsure select "Y".
|
|
||||||
|
|
||||||
endif ## SND_SOC_SOF_HDA_COMMON
|
endif ## SND_SOC_SOF_HDA_COMMON
|
||||||
|
|
||||||
config SND_SOC_SOF_HDA_LINK_BASELINE
|
config SND_SOC_SOF_HDA_LINK_BASELINE
|
||||||
|
@ -54,8 +54,7 @@ static int hda_dmic_num = -1;
|
|||||||
module_param_named(dmic_num, hda_dmic_num, int, 0444);
|
module_param_named(dmic_num, hda_dmic_num, int, 0444);
|
||||||
MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number");
|
MODULE_PARM_DESC(dmic_num, "SOF HDA DMIC number");
|
||||||
|
|
||||||
static bool hda_codec_use_common_hdmi =
|
static bool hda_codec_use_common_hdmi = IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI);
|
||||||
IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC);
|
|
||||||
module_param_named(use_common_hdmi, hda_codec_use_common_hdmi, bool, 0444);
|
module_param_named(use_common_hdmi, hda_codec_use_common_hdmi, bool, 0444);
|
||||||
MODULE_PARM_DESC(use_common_hdmi, "SOF HDA use common HDMI codec driver");
|
MODULE_PARM_DESC(use_common_hdmi, "SOF HDA use common HDMI codec driver");
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user