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

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

ASoC: Intel: bytcr_rt5651: Move getting of codec_dev into probe() 



Move the getting of the codec_dev, to add device-props to it, out of
byt_rt5651_add_codec_device_props() and into its caller,
snd_byt_rt5651_mc_probe().

This is a preparation patch for adding support for an external amplifier
enable GPIO, which requires further accesses to the codec_dev.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fbea16db

sound/soc/intel/boards/bytcr_rt5651.c

+11 −12
Original line number Diff line number Diff line
@@ -403,15 +403,10 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { 
 * Note this MUST be called before snd_soc_register_card(), so that the props

 * are in place before the codec component driver's probe function parses them.

 */

static int byt_rt5651_add_codec_device_props(const char *i2c_dev_name)

static int byt_rt5651_add_codec_device_props(struct device *i2c_dev)

{

	struct property_entry props[MAX_NO_PROPS] = {};

	struct device *i2c_dev;

	int ret, cnt = 0;



	i2c_dev = bus_find_device_by_name(&i2c_bus_type, NULL, i2c_dev_name);

	if (!i2c_dev)

		return -EPROBE_DEFER;

	int cnt = 0;



	props[cnt++] = PROPERTY_ENTRY_U32("realtek,jack-detect-source",

				BYT_RT5651_JDSRC(byt_rt5651_quirk));
@@ -425,10 +420,7 @@ static int byt_rt5651_add_codec_device_props(const char *i2c_dev_name) 
	if (byt_rt5651_quirk & BYT_RT5651_DMIC_EN)

		props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,dmic-en");



	ret = device_add_properties(i2c_dev, props);

	put_device(i2c_dev);



	return ret;

	return device_add_properties(i2c_dev, props);

}



static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
@@ -696,6 +688,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	const char * const mic_name[] = { "dmic", "in1", "in12" };

	struct byt_rt5651_private *priv;

	struct snd_soc_acpi_mach *mach;

	struct device *codec_dev;

	const char *i2c_name = NULL;

	const char *hp_swapped;

	bool is_bytcr = false;
@@ -731,6 +724,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		"%s%s", "i2c-", i2c_name);

	byt_rt5651_dais[dai_index].codec_name = byt_rt5651_codec_name;



	codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL,

					    byt_rt5651_codec_name);

	if (!codec_dev)

		return -EPROBE_DEFER;



	/*

	 * swap SSP0 if bytcr is detected

	 * (will be overridden if DMI quirk is detected)
@@ -794,7 +792,8 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	dmi_check_system(byt_rt5651_quirk_table);



	/* Must be called before register_card, also see declaration comment. */

	ret_val = byt_rt5651_add_codec_device_props(byt_rt5651_codec_name);

	ret_val = byt_rt5651_add_codec_device_props(codec_dev);

	put_device(codec_dev);

	if (ret_val)

		return ret_val;