Merge series "ASoC: Intel: boards: use software node API" from Pierre-Louis... (31e53e13) · Commits · EulixOS / Software / Kernel

sound/soc/intel/boards/bytcht_es8316.c

+26 −5

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ struct byt_cht_es8316_private {
	struct clk *mclk;		struct clk *mclk;
	struct snd_soc_jack jack;		struct snd_soc_jack jack;
	struct gpio_desc *speaker_en_gpio;		struct gpio_desc *speaker_en_gpio;
			struct device *codec_dev;
	bool speaker_en;		bool speaker_en;
	};		};

	@@ -461,6 +462,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	const struct dmi_system_id *dmi_id;		const struct dmi_system_id *dmi_id;
	struct device *dev = &pdev->dev;		struct device *dev = &pdev->dev;
	struct snd_soc_acpi_mach *mach;		struct snd_soc_acpi_mach *mach;
			struct fwnode_handle *fwnode;
	const char *platform_name;		const char *platform_name;
	struct acpi_device *adev;		struct acpi_device *adev;
	struct device *codec_dev;		struct device *codec_dev;
	@@ -491,6 +493,9 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	"i2c-%s", acpi_dev_name(adev));		"i2c-%s", acpi_dev_name(adev));
	put_device(&adev->dev);		put_device(&adev->dev);
	byt_cht_es8316_dais[dai_index].codecs->name = codec_name;		byt_cht_es8316_dais[dai_index].codecs->name = codec_name;
			} else {
			dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
			return -ENXIO;
	}		}

	/* override plaform name, if required */		/* override plaform name, if required */
	@@ -535,15 +540,25 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	}		}

	/* get speaker enable GPIO */		/* get speaker enable GPIO */
	codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, codec_name);		codec_dev = acpi_get_first_physical_node(adev);
	if (!codec_dev)		if (!codec_dev)
	return -EPROBE_DEFER;		return -EPROBE_DEFER;
			priv->codec_dev = get_device(codec_dev);

	if (quirk & BYT_CHT_ES8316_JD_INVERTED)		if (quirk & BYT_CHT_ES8316_JD_INVERTED)
	props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");		props[cnt++] = PROPERTY_ENTRY_BOOL("everest,jack-detect-inverted");

	if (cnt) {		if (cnt) {
	ret = device_add_properties(codec_dev, props);		fwnode = fwnode_create_software_node(props, NULL);
			if (IS_ERR(fwnode)) {
			put_device(codec_dev);
			return PTR_ERR(fwnode);
			}

			ret = device_add_software_node(codec_dev, to_software_node(fwnode));

			fwnode_handle_put(fwnode);

	if (ret) {		if (ret) {
	put_device(codec_dev);		put_device(codec_dev);
	return ret;		return ret;
	@@ -555,7 +570,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	gpiod_get_index(codec_dev, "speaker-enable", 0,		gpiod_get_index(codec_dev, "speaker-enable", 0,
	/* see comment in byt_cht_es8316_resume */		/* see comment in byt_cht_es8316_resume */
	GPIOD_OUT_LOW \| GPIOD_FLAGS_BIT_NONEXCLUSIVE);		GPIOD_OUT_LOW \| GPIOD_FLAGS_BIT_NONEXCLUSIVE);
	put_device(codec_dev);

	if (IS_ERR(priv->speaker_en_gpio)) {		if (IS_ERR(priv->speaker_en_gpio)) {
	ret = PTR_ERR(priv->speaker_en_gpio);		ret = PTR_ERR(priv->speaker_en_gpio);
	@@ -567,7 +581,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	dev_err(dev, "get speaker GPIO failed: %d\n", ret);		dev_err(dev, "get speaker GPIO failed: %d\n", ret);
	fallthrough;		fallthrough;
	case -EPROBE_DEFER:		case -EPROBE_DEFER:
	return ret;		goto err_put_codec;
	}		}
	}		}

	@@ -605,10 +619,15 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
	if (ret) {		if (ret) {
	gpiod_put(priv->speaker_en_gpio);		gpiod_put(priv->speaker_en_gpio);
	dev_err(dev, "snd_soc_register_card failed: %d\n", ret);		dev_err(dev, "snd_soc_register_card failed: %d\n", ret);
	return ret;		goto err_put_codec;
	}		}
	platform_set_drvdata(pdev, &byt_cht_es8316_card);		platform_set_drvdata(pdev, &byt_cht_es8316_card);
	return 0;		return 0;

			err_put_codec:
			device_remove_software_node(priv->codec_dev);
			put_device(priv->codec_dev);
			return ret;
	}		}

	static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)		static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)
	@@ -617,6 +636,8 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev)
	struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card);		struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card);

	gpiod_put(priv->speaker_en_gpio);		gpiod_put(priv->speaker_en_gpio);
			device_remove_software_node(priv->codec_dev);
			put_device(priv->codec_dev);
	return 0;		return 0;
	}		}

sound/soc/intel/boards/bytcr_rt5640.c

+46 −14

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,7 @@ enum {
	struct byt_rt5640_private {		struct byt_rt5640_private {
	struct snd_soc_jack jack;		struct snd_soc_jack jack;
	struct clk *mclk;		struct clk *mclk;
			struct device *codec_dev;
	};		};
	static bool is_bytcr;		static bool is_bytcr;

	@@ -969,15 +970,13 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
	* Note this MUST be called before snd_soc_register_card(), so that the props		* 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.		* are in place before the codec component driver's probe function parses them.
	*/		*/
	static int byt_rt5640_add_codec_device_props(const char *i2c_dev_name)		static int byt_rt5640_add_codec_device_props(struct device *i2c_dev,
			struct byt_rt5640_private *priv)
	{		{
	struct property_entry props[MAX_NO_PROPS] = {};		struct property_entry props[MAX_NO_PROPS] = {};
	struct device *i2c_dev;		struct fwnode_handle *fwnode;
	int ret, cnt = 0;		int cnt = 0;
			int ret;
	i2c_dev = bus_find_device_by_name(&i2c_bus_type, NULL, i2c_dev_name);
	if (!i2c_dev)
	return -EPROBE_DEFER;

	switch (BYT_RT5640_MAP(byt_rt5640_quirk)) {		switch (BYT_RT5640_MAP(byt_rt5640_quirk)) {
	case BYT_RT5640_DMIC1_MAP:		case BYT_RT5640_DMIC1_MAP:
	@@ -1017,8 +1016,15 @@ static int byt_rt5640_add_codec_device_props(const char *i2c_dev_name)
	if (byt_rt5640_quirk & BYT_RT5640_JD_NOT_INV)		if (byt_rt5640_quirk & BYT_RT5640_JD_NOT_INV)
	props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted");		props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted");

	ret = device_add_properties(i2c_dev, props);		fwnode = fwnode_create_software_node(props, NULL);
	put_device(i2c_dev);		if (IS_ERR(fwnode)) {
			/* put_device() is handled in caller */
			return PTR_ERR(fwnode);
			}

			ret = device_add_software_node(i2c_dev, to_software_node(fwnode));

			fwnode_handle_put(fwnode);

	return ret;		return ret;
	}		}
	@@ -1367,6 +1373,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	struct snd_soc_acpi_mach *mach;		struct snd_soc_acpi_mach *mach;
	const char *platform_name;		const char *platform_name;
	struct acpi_device *adev;		struct acpi_device *adev;
			struct device *codec_dev;
	bool sof_parent;		bool sof_parent;
	int ret_val = 0;		int ret_val = 0;
	int dai_index = 0;		int dai_index = 0;
	@@ -1399,6 +1406,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	"i2c-%s", acpi_dev_name(adev));		"i2c-%s", acpi_dev_name(adev));
	put_device(&adev->dev);		put_device(&adev->dev);
	byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name;		byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name;
			} else {
			dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
			return -ENXIO;
	}		}

	/*		/*
	@@ -1475,10 +1485,15 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	byt_rt5640_quirk = quirk_override;		byt_rt5640_quirk = quirk_override;
	}		}

			codec_dev = acpi_get_first_physical_node(adev);
			if (!codec_dev)
			return -EPROBE_DEFER;
			priv->codec_dev = get_device(codec_dev);

	/* Must be called before register_card, also see declaration comment. */		/* Must be called before register_card, also see declaration comment. */
	ret_val = byt_rt5640_add_codec_device_props(byt_rt5640_codec_name);		ret_val = byt_rt5640_add_codec_device_props(codec_dev, priv);
	if (ret_val)		if (ret_val)
	return ret_val;		goto err_device;

	log_quirks(&pdev->dev);		log_quirks(&pdev->dev);

	@@ -1509,7 +1524,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	* for all other errors, including -EPROBE_DEFER		* for all other errors, including -EPROBE_DEFER
	*/		*/
	if (ret_val != -ENOENT)		if (ret_val != -ENOENT)
	return ret_val;		goto err;
	byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN;		byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN;
	}		}
	}		}
	@@ -1553,7 +1568,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5640_card,		ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5640_card,
	platform_name);		platform_name);
	if (ret_val)		if (ret_val)
	return ret_val;		goto err;

	sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);		sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);

	@@ -1575,10 +1590,26 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
	if (ret_val) {		if (ret_val) {
	dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",		dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",
	ret_val);		ret_val);
	return ret_val;		goto err;
	}		}
	platform_set_drvdata(pdev, &byt_rt5640_card);		platform_set_drvdata(pdev, &byt_rt5640_card);
	return ret_val;		return ret_val;

			err:
			device_remove_software_node(priv->codec_dev);
			err_device:
			put_device(priv->codec_dev);
			return ret_val;
			}

			static int snd_byt_rt5640_mc_remove(struct platform_device *pdev)
			{
			struct snd_soc_card *card = platform_get_drvdata(pdev);
			struct byt_rt5640_private *priv = snd_soc_card_get_drvdata(card);

			device_remove_software_node(priv->codec_dev);
			put_device(priv->codec_dev);
			return 0;
	}		}

	static struct platform_driver snd_byt_rt5640_mc_driver = {		static struct platform_driver snd_byt_rt5640_mc_driver = {
	@@ -1586,6 +1617,7 @@ static struct platform_driver snd_byt_rt5640_mc_driver = {
	.name = "bytcr_rt5640",		.name = "bytcr_rt5640",
	},		},
	.probe = snd_byt_rt5640_mc_probe,		.probe = snd_byt_rt5640_mc_probe,
			.remove = snd_byt_rt5640_mc_remove,
	};		};

	module_platform_driver(snd_byt_rt5640_mc_driver);		module_platform_driver(snd_byt_rt5640_mc_driver);

sound/soc/intel/boards/bytcr_rt5651.c

+44 −19

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,7 @@ struct byt_rt5651_private {
	struct gpio_desc *ext_amp_gpio;		struct gpio_desc *ext_amp_gpio;
	struct gpio_desc *hp_detect;		struct gpio_desc *hp_detect;
	struct snd_soc_jack jack;		struct snd_soc_jack jack;
			struct device *codec_dev;
	};		};

	static const struct acpi_gpio_mapping *byt_rt5651_gpios;		static const struct acpi_gpio_mapping *byt_rt5651_gpios;
	@@ -527,10 +528,13 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
	* Note this MUST be called before snd_soc_register_card(), so that the props		* 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.		* are in place before the codec component driver's probe function parses them.
	*/		*/
	static int byt_rt5651_add_codec_device_props(struct device *i2c_dev)		static int byt_rt5651_add_codec_device_props(struct device *i2c_dev,
			struct byt_rt5651_private *priv)
	{		{
	struct property_entry props[MAX_NO_PROPS] = {};		struct property_entry props[MAX_NO_PROPS] = {};
			struct fwnode_handle *fwnode;
	int cnt = 0;		int cnt = 0;
			int ret;

	props[cnt++] = PROPERTY_ENTRY_U32("realtek,jack-detect-source",		props[cnt++] = PROPERTY_ENTRY_U32("realtek,jack-detect-source",
	BYT_RT5651_JDSRC(byt_rt5651_quirk));		BYT_RT5651_JDSRC(byt_rt5651_quirk));
	@@ -547,7 +551,17 @@ static int byt_rt5651_add_codec_device_props(struct device *i2c_dev)
	if (byt_rt5651_quirk & BYT_RT5651_JD_NOT_INV)		if (byt_rt5651_quirk & BYT_RT5651_JD_NOT_INV)
	props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted");		props[cnt++] = PROPERTY_ENTRY_BOOL("realtek,jack-detect-not-inverted");

	return device_add_properties(i2c_dev, props);		fwnode = fwnode_create_software_node(props, NULL);
			if (IS_ERR(fwnode)) {
			/* put_device(i2c_dev) is handled in caller */
			return PTR_ERR(fwnode);
			}

			ret = device_add_software_node(i2c_dev, to_software_node(fwnode));

			fwnode_handle_put(fwnode);

			return ret;
	}		}

	static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)		static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
	@@ -920,13 +934,13 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name;		byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name;
	} else {		} else {
	dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);
	return -ENODEV;		return -ENXIO;
	}		}

	codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL,		codec_dev = acpi_get_first_physical_node(adev);
	byt_rt5651_codec_name);
	if (!codec_dev)		if (!codec_dev)
	return -EPROBE_DEFER;		return -EPROBE_DEFER;
			priv->codec_dev = get_device(codec_dev);

	/*		/*
	* swap SSP0 if bytcr is detected		* swap SSP0 if bytcr is detected
	@@ -994,11 +1008,9 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	}		}

	/* Must be called before register_card, also see declaration comment. */		/* Must be called before register_card, also see declaration comment. */
	ret_val = byt_rt5651_add_codec_device_props(codec_dev);		ret_val = byt_rt5651_add_codec_device_props(codec_dev, priv);
	if (ret_val) {		if (ret_val)
	put_device(codec_dev);		goto err_device;
	return ret_val;
	}

	/* Cherry Trail devices use an external amplifier enable gpio */		/* Cherry Trail devices use an external amplifier enable gpio */
	if (soc_intel_is_cht() && !byt_rt5651_gpios)		if (soc_intel_is_cht() && !byt_rt5651_gpios)
	@@ -1022,8 +1034,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	ret_val);		ret_val);
	fallthrough;		fallthrough;
	case -EPROBE_DEFER:		case -EPROBE_DEFER:
	put_device(codec_dev);		goto err;
	return ret_val;
	}		}
	}		}
	priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev,		priv->hp_detect = devm_fwnode_gpiod_get(&pdev->dev,
	@@ -1042,14 +1053,11 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	ret_val);		ret_val);
	fallthrough;		fallthrough;
	case -EPROBE_DEFER:		case -EPROBE_DEFER:
	put_device(codec_dev);		goto err;
	return ret_val;
	}		}
	}		}
	}		}

	put_device(codec_dev);

	log_quirks(&pdev->dev);		log_quirks(&pdev->dev);

	if ((byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) \|\|		if ((byt_rt5651_quirk & BYT_RT5651_SSP2_AIF2) \|\|
	@@ -1073,7 +1081,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	* for all other errors, including -EPROBE_DEFER		* for all other errors, including -EPROBE_DEFER
	*/		*/
	if (ret_val != -ENOENT)		if (ret_val != -ENOENT)
	return ret_val;		goto err;
	byt_rt5651_quirk &= ~BYT_RT5651_MCLK_EN;		byt_rt5651_quirk &= ~BYT_RT5651_MCLK_EN;
	}		}
	}		}
	@@ -1102,7 +1110,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5651_card,		ret_val = snd_soc_fixup_dai_links_platform_name(&byt_rt5651_card,
	platform_name);		platform_name);
	if (ret_val)		if (ret_val)
	return ret_val;		goto err;

	sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);		sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);

	@@ -1124,10 +1132,26 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
	if (ret_val) {		if (ret_val) {
	dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",		dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",
	ret_val);		ret_val);
	return ret_val;		goto err;
	}		}
	platform_set_drvdata(pdev, &byt_rt5651_card);		platform_set_drvdata(pdev, &byt_rt5651_card);
	return ret_val;		return ret_val;

			err:
			device_remove_software_node(priv->codec_dev);
			err_device:
			put_device(priv->codec_dev);
			return ret_val;
			}

			static int snd_byt_rt5651_mc_remove(struct platform_device *pdev)
			{
			struct snd_soc_card *card = platform_get_drvdata(pdev);
			struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);

			device_remove_software_node(priv->codec_dev);
			put_device(priv->codec_dev);
			return 0;
	}		}

	static struct platform_driver snd_byt_rt5651_mc_driver = {		static struct platform_driver snd_byt_rt5651_mc_driver = {
	@@ -1135,6 +1159,7 @@ static struct platform_driver snd_byt_rt5651_mc_driver = {
	.name = "bytcr_rt5651",		.name = "bytcr_rt5651",
	},		},
	.probe = snd_byt_rt5651_mc_probe,		.probe = snd_byt_rt5651_mc_probe,
			.remove = snd_byt_rt5651_mc_remove,
	};		};

	module_platform_driver(snd_byt_rt5651_mc_driver);		module_platform_driver(snd_byt_rt5651_mc_driver);

sound/soc/intel/boards/sof_sdw.c

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -352,7 +352,8 @@ static const struct snd_soc_ops sdw_ops = {
	.shutdown = sdw_shutdown,		.shutdown = sdw_shutdown,
	};		};

	static int sof_sdw_mic_codec_mockup_init(const struct snd_soc_acpi_link_adr *link,		static int sof_sdw_mic_codec_mockup_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback)		bool playback)
	@@ -697,7 +698,8 @@ static int create_codec_dai_name(struct device *dev,
	return 0;		return 0;
	}		}

	static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link,		static int set_codec_init_func(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	bool playback, int group_id)		bool playback, int group_id)
	{		{
	@@ -720,7 +722,8 @@ static int set_codec_init_func(const struct snd_soc_acpi_link_adr *link,
	if (link->adr_d[i].endpoints->group_id != group_id)		if (link->adr_d[i].endpoints->group_id != group_id)
	continue;		continue;
	if (codec_info_list[codec_index].init)		if (codec_info_list[codec_index].init)
	codec_info_list[codec_index].init(link,		codec_info_list[codec_index].init(card,
			link,
	dai_links,		dai_links,
	&codec_info_list[codec_index],		&codec_info_list[codec_index],
	playback);		playback);
	@@ -805,7 +808,8 @@ static int get_slave_info(const struct snd_soc_acpi_link_adr *adr_link,
	return 0;		return 0;
	}		}

	static int create_sdw_dailink(struct device dev, int be_index,		static int create_sdw_dailink(struct snd_soc_card *card,
			struct device dev, int be_index,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	int sdw_be_num, int sdw_cpu_dai_num,		int sdw_be_num, int sdw_cpu_dai_num,
	struct snd_soc_dai_link_component *cpus,		struct snd_soc_dai_link_component *cpus,
	@@ -926,7 +930,7 @@ static int create_sdw_dailink(struct device dev, int be_index,
	codecs, codec_num,		codecs, codec_num,
	NULL, &sdw_ops);		NULL, &sdw_ops);

	ret = set_codec_init_func(link, dai_links + (*be_index)++,		ret = set_codec_init_func(card, link, dai_links + (*be_index)++,
	playback, group_id);		playback, group_id);
	if (ret < 0) {		if (ret < 0) {
	dev_err(dev, "failed to init codec %d", codec_index);		dev_err(dev, "failed to init codec %d", codec_index);
	@@ -1107,7 +1111,7 @@ static int sof_card_dai_links_create(struct device *dev,
	group_generated[endpoint->group_id])		group_generated[endpoint->group_id])
	continue;		continue;

	ret = create_sdw_dailink(dev, &be_id, links, sdw_be_num,		ret = create_sdw_dailink(card, dev, &be_id, links, sdw_be_num,
	sdw_cpu_dai_num, cpus, adr_link,		sdw_cpu_dai_num, cpus, adr_link,
	&cpu_id, group_generated,		&cpu_id, group_generated,
	codec_conf, codec_conf_count,		codec_conf, codec_conf_count,
	@@ -1170,7 +1174,7 @@ static int sof_card_dai_links_create(struct device *dev,
	ssp_components, 1,		ssp_components, 1,
	NULL, info->ops);		NULL, info->ops);

	ret = info->init(NULL, links + link_id, info, 0);		ret = info->init(card, NULL, links + link_id, info, 0);
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

	@@ -1393,7 +1397,7 @@ static int mc_remove(struct platform_device *pdev)
	for_each_card_prelinks(card, j, link) {		for_each_card_prelinks(card, j, link) {
	if (!strcmp(link->codecs[0].dai_name,		if (!strcmp(link->codecs[0].dai_name,
	codec_info_list[i].dai_name)) {		codec_info_list[i].dai_name)) {
	ret = codec_info_list[i].exit(&pdev->dev, link);		ret = codec_info_list[i].exit(card, link);
	if (ret)		if (ret)
	dev_warn(&pdev->dev,		dev_warn(&pdev->dev,
	"codec exit failed %d\n",		"codec exit failed %d\n",

sound/soc/intel/boards/sof_sdw_common.h

+24 −13

Original line number	Original line	Diff line number	Diff line
	@@ -62,12 +62,13 @@ struct sof_sdw_codec_info {
	const char *dai_name;		const char *dai_name;
	const struct snd_soc_ops *ops;		const struct snd_soc_ops *ops;

	int (init)(const struct snd_soc_acpi_link_adr link,		int (init)(struct snd_soc_card card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);

	int (exit)(struct device dev, struct snd_soc_dai_link *dai_link);		int (exit)(struct snd_soc_card card, struct snd_soc_dai_link *dai_link);
	bool late_probe;		bool late_probe;
	int (codec_card_late_probe)(struct snd_soc_card card);		int (codec_card_late_probe)(struct snd_soc_card card);
	};		};
	@@ -76,6 +77,7 @@ struct mc_private {
	struct list_head hdmi_pcm_list;		struct list_head hdmi_pcm_list;
	bool idisp_codec;		bool idisp_codec;
	struct snd_soc_jack sdw_headset;		struct snd_soc_jack sdw_headset;
			struct device headset_codec_dev; / only one headset per card */
	};		};

	extern unsigned long sof_sdw_quirk;		extern unsigned long sof_sdw_quirk;
	@@ -95,21 +97,24 @@ int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);
	int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);		int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);

	/* RT711 support */		/* RT711 support */
	int sof_sdw_rt711_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt711_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);
	int sof_sdw_rt711_exit(struct device dev, struct snd_soc_dai_link dai_link);		int sof_sdw_rt711_exit(struct snd_soc_card card, struct snd_soc_dai_link dai_link);

	/* RT711-SDCA support */		/* RT711-SDCA support */
	int sof_sdw_rt711_sdca_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt711_sdca_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);
	int sof_sdw_rt711_sdca_exit(struct device dev, struct snd_soc_dai_link dai_link);		int sof_sdw_rt711_sdca_exit(struct snd_soc_card card, struct snd_soc_dai_link dai_link);

	/* RT700 support */		/* RT700 support */
	int sof_sdw_rt700_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt700_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);
	@@ -117,31 +122,36 @@ int sof_sdw_rt700_init(const struct snd_soc_acpi_link_adr *link,
	/* RT1308 support */		/* RT1308 support */
	extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops;		extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops;

	int sof_sdw_rt1308_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt1308_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);

	/* RT1316 support */		/* RT1316 support */
	int sof_sdw_rt1316_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt1316_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);

	/* RT715 support */		/* RT715 support */
	int sof_sdw_rt715_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt715_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);

	/* RT715-SDCA support */		/* RT715-SDCA support */
	int sof_sdw_rt715_sdca_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt715_sdca_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);

	/* MAX98373 support */		/* MAX98373 support */
	int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_mx8373_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);
	@@ -149,7 +159,8 @@ int sof_sdw_mx8373_init(const struct snd_soc_acpi_link_adr *link,
	int sof_sdw_mx8373_late_probe(struct snd_soc_card *card);		int sof_sdw_mx8373_late_probe(struct snd_soc_card *card);

	/* RT5682 support */		/* RT5682 support */
	int sof_sdw_rt5682_init(const struct snd_soc_acpi_link_adr *link,		int sof_sdw_rt5682_init(struct snd_soc_card *card,
			const struct snd_soc_acpi_link_adr *link,
	struct snd_soc_dai_link *dai_links,		struct snd_soc_dai_link *dai_links,
	struct sof_sdw_codec_info *info,		struct sof_sdw_codec_info *info,
	bool playback);		bool playback);