Commit cb2cf612 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core - Add convenience register for platform kcontrol and DAPM 



Allow platform probe to register platform kcontrols and DAPM just like
the CODEC probe().

Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b7950641

include/sound/soc.h

+8 −0
Original line number Diff line number Diff line
@@ -651,6 +651,14 @@ struct snd_soc_platform_driver { 
	int (*pcm_new)(struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_pcm *);



	/* Default control and setup, added after probe() is run */

	const struct snd_kcontrol_new *controls;

	int num_controls;

	const struct snd_soc_dapm_widget *dapm_widgets;

	int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

	int num_dapm_routes;



	/*

	 * For platform caused delay reporting.

	 * Optional.

sound/soc/soc-core.c

+11 −0
Original line number Diff line number Diff line
@@ -998,6 +998,10 @@ static int soc_probe_platform(struct snd_soc_card *card, 
	if (!try_module_get(platform->dev->driver->owner))

		return -ENODEV;



	if (driver->dapm_widgets)

		snd_soc_dapm_new_controls(&platform->dapm,

			driver->dapm_widgets, driver->num_dapm_widgets);



	if (driver->probe) {

		ret = driver->probe(platform);

		if (ret < 0) {
@@ -1008,6 +1012,13 @@ static int soc_probe_platform(struct snd_soc_card *card, 
		}

	}



	if (driver->controls)

		snd_soc_add_platform_controls(platform, driver->controls,

				     driver->num_controls);

	if (driver->dapm_routes)

		snd_soc_dapm_add_routes(&platform->dapm, driver->dapm_routes,

					driver->num_dapm_routes);



	/* mark platform as probed and add to card platform list */

	platform->probed = 1;

	list_add(&platform->card_list, &card->platform_dev_list);