ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's (c68e0797) · Commits · 戴 / test

sound/soc/intel/boards/sof_rt5682.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,10 @@
		#define SOF_RT5682_SSP_AMP(quirk) \
		(((quirk) << SOF_RT5682_SSP_AMP_SHIFT) & SOF_RT5682_SSP_AMP_MASK)
		#define SOF_RT5682_MCLK_BYTCHT_EN BIT(9)
		#define SOF_RT5682_NUM_HDMIDEV_SHIFT 10
		#define SOF_RT5682_NUM_HDMIDEV_MASK (GENMASK(12, 10))
		#define SOF_RT5682_NUM_HDMIDEV(quirk) \
		((quirk << SOF_RT5682_NUM_HDMIDEV_SHIFT) & SOF_RT5682_NUM_HDMIDEV_MASK)

		/* Default: MCLK on, MCLK 19.2M, SSP0 */
		static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN \|
		@@ -594,6 +598,8 @@ static int sof_audio_probe(struct platform_device *pdev)
		if (!ctx)
		return -ENOMEM;

		dmi_check_system(sof_rt5682_quirk_table);

		if (soc_intel_is_byt() \|\| soc_intel_is_cht()) {
		is_legacy_cpu = 1;
		dmic_be_num = 0;
		@@ -604,11 +610,13 @@ static int sof_audio_probe(struct platform_device *pdev)
		SOF_RT5682_SSP_CODEC(2);
		} else {
		dmic_be_num = 2;
		hdmi_num = (sof_rt5682_quirk & SOF_RT5682_NUM_HDMIDEV_MASK) >>
		SOF_RT5682_NUM_HDMIDEV_SHIFT;
		/* default number of HDMI DAI's */
		if (!hdmi_num)
		hdmi_num = 3;
		}

		dmi_check_system(sof_rt5682_quirk_table);

		/* need to get main clock from pmc */
		if (sof_rt5682_quirk & SOF_RT5682_MCLK_BYTCHT_EN) {
		ctx->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");