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

Commit 59acd5df authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and... 

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and 'asoc/topic/doc' into asoc-next
parents b7707a8b 3f81d9aa d6075c26 8abab35f

sound/soc/davinci/davinci-evm.c

+10 −3
Original line number Diff line number Diff line
@@ -358,13 +358,20 @@ static struct snd_soc_card evm_soc_card = { 
static int davinci_evm_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match =

		of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);

	struct snd_soc_dai_link *dai = (struct snd_soc_dai_link *) match->data;

	const struct of_device_id *match;

	struct snd_soc_dai_link *dai;

	struct snd_soc_card_drvdata_davinci *drvdata = NULL;

	struct clk *mclk;

	int ret = 0;



	match = of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);

	if (!match) {

		dev_err(&pdev->dev, "Error: No device match found\n");

		return -ENODEV;

	}



	dai = (struct snd_soc_dai_link *) match->data;



	evm_soc_card.dai_link = dai;



	dai->codec_of_node = of_parse_phandle(np, "ti,audio-codec", 0);

sound/soc/soc-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec); 


/**

 * snd_soc_free_ac97_codec - free AC97 codec device

 * @codec: audio codec

 * @ac97: snd_ac97 device to be freed

 *

 * Frees AC97 codec device resources.

 */

sound/soc/soc-core.c

+1 −3
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ EXPORT_SYMBOL_GPL(snd_soc_find_dai); 
 * @card: soc card

 * @id: DAI link ID to match

 * @name: DAI link name to match, optional

 * @stream name: DAI link stream name to match, optional

 * @stream_name: DAI link stream name to match, optional

 *

 * This function will search all existing DAI links of the soc card to

 * find the link of the same ID. Since DAI links may not have their
@@ -4203,8 +4203,6 @@ static void __exit snd_soc_exit(void) 
	snd_soc_util_exit();

	snd_soc_debugfs_exit();



#ifdef CONFIG_DEBUG_FS

#endif

	platform_driver_unregister(&soc_driver);

}

module_exit(snd_soc_exit);

sound/soc/soc-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, 
EXPORT_SYMBOL_GPL(snd_soc_put_enum_double);



/**

 * snd_soc_read_signed - Read a codec register and interprete as signed value

 * snd_soc_read_signed - Read a codec register and interpret as signed value

 * @component: component

 * @reg: Register to read

 * @mask: Mask to use after shifting the register value

sound/soc/soc-topology.c

+3 −3
Original line number Diff line number Diff line
@@ -1927,7 +1927,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg, 


/**

 * set_link_hw_format - Set the HW audio format of the physical DAI link.

 * @tplg: topology context

 * @link: &snd_soc_dai_link which should be updated

 * @cfg: physical link configs.

 *

 * Topology context contains a list of supported HW formats (configs) and
@@ -1978,7 +1978,7 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, 
/**

 * link_new_ver - Create a new physical link config from the old

 * version of source.

 * @toplogy: topology context

 * @tplg: topology context

 * @src: old version of phyical link config as a source

 * @link: latest version of physical link config created from the source

 *
@@ -2220,7 +2220,7 @@ static int soc_tplg_dai_elems_load(struct soc_tplg *tplg, 
/**

 * manifest_new_ver - Create a new version of manifest from the old version

 * of source.

 * @toplogy: topology context

 * @tplg: topology context

 * @src: old version of manifest as a source

 * @manifest: latest version of manifest created from the source

 *