Unverified Commit f87b4402 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: cht_bsw_rt5645: Set card.components string 



Set the card.components string using the new rt5645_components() helper
which returns a components string based on the DMI quirks inside the
rt5645 codec driver.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://msgid.link/r/20231126214024.300505-8-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8184e1db

sound/soc/intel/boards/cht_bsw_rt5645.c

+8 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	const char *platform_name;

	struct cht_mc_private *drv;

	struct acpi_device *adev;

	struct device *codec_dev;

	bool sof_parent;

	bool found = false;

	bool is_bytcr = false;
@@ -583,7 +584,14 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
			 "i2c-%s", acpi_dev_name(adev));

		cht_dailink[dai_index].codecs->name = cht_rt5645_codec_name;

	}

	/* acpi_get_first_physical_node() returns a borrowed ref, no need to deref */

	codec_dev = acpi_get_first_physical_node(adev);

	acpi_dev_put(adev);

	if (!codec_dev)

		return -EPROBE_DEFER;



	snd_soc_card_chtrt5645.components = rt5645_components(codec_dev);

	snd_soc_card_chtrt5650.components = rt5645_components(codec_dev);



	/*

	 * swap SSP0 if bytcr is detected