Merge branch 'asoc-5.0' into asoc-5.1 for dapm table
This commit is contained in:
commit
e29fe437ea
|
@ -6154,7 +6154,7 @@ FREESCALE SOC SOUND DRIVERS
|
|||
M: Timur Tabi <timur@kernel.org>
|
||||
M: Nicolin Chen <nicoleotsuka@gmail.com>
|
||||
M: Xiubo Li <Xiubo.Lee@gmail.com>
|
||||
R: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
R: Fabio Estevam <festevam@gmail.com>
|
||||
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
||||
L: linuxppc-dev@lists.ozlabs.org
|
||||
S: Maintained
|
||||
|
@ -10901,7 +10901,7 @@ F: include/linux/nvmem-consumer.h
|
|||
F: include/linux/nvmem-provider.h
|
||||
|
||||
NXP SGTL5000 DRIVER
|
||||
M: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
M: Fabio Estevam <festevam@gmail.com>
|
||||
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/sound/sgtl5000.txt
|
||||
|
|
|
@ -795,6 +795,8 @@ static int hdmi_codec_probe(struct platform_device *pdev)
|
|||
if (hcd->spdif)
|
||||
hcp->daidrv[i] = hdmi_spdif_dai;
|
||||
|
||||
dev_set_drvdata(dev, hcp);
|
||||
|
||||
ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv,
|
||||
dai_count);
|
||||
if (ret) {
|
||||
|
@ -802,8 +804,6 @@ static int hdmi_codec_probe(struct platform_device *pdev)
|
|||
__func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, hcp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1784,7 +1784,9 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = {
|
|||
{"ADC Stereo1 Filter", NULL, "ADC STO1 ASRC", is_using_asrc},
|
||||
{"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc},
|
||||
{"ADC STO1 ASRC", NULL, "AD ASRC"},
|
||||
{"ADC STO1 ASRC", NULL, "DA ASRC"},
|
||||
{"ADC STO1 ASRC", NULL, "CLKDET"},
|
||||
{"DAC STO1 ASRC", NULL, "AD ASRC"},
|
||||
{"DAC STO1 ASRC", NULL, "DA ASRC"},
|
||||
{"DAC STO1 ASRC", NULL, "CLKDET"},
|
||||
|
||||
|
|
|
@ -1524,14 +1524,14 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
|
|||
int ret;
|
||||
|
||||
/*
|
||||
* 1) Avoid duplicate register (ex. MIXer case)
|
||||
* 2) re-register if card was rebinded
|
||||
* 1) Avoid duplicate register for DVC with MIX case
|
||||
* 2) Allow duplicate register for MIX
|
||||
* 3) re-register if card was rebinded
|
||||
*/
|
||||
list_for_each_entry(kctrl, &card->controls, list) {
|
||||
struct rsnd_kctrl_cfg *c = kctrl->private_data;
|
||||
|
||||
if (strcmp(kctrl->id.name, name) == 0 &&
|
||||
c->mod == mod)
|
||||
if (c == cfg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -742,12 +742,17 @@ static struct snd_soc_component *soc_find_component(
|
|||
const struct device_node *of_node, const char *name)
|
||||
{
|
||||
struct snd_soc_component *component;
|
||||
struct device_node *component_of_node;
|
||||
|
||||
lockdep_assert_held(&client_mutex);
|
||||
|
||||
for_each_component(component) {
|
||||
if (of_node) {
|
||||
if (component->dev->of_node == of_node)
|
||||
component_of_node = component->dev->of_node;
|
||||
if (!component_of_node && component->dev->parent)
|
||||
component_of_node = component->dev->parent->of_node;
|
||||
|
||||
if (component_of_node == of_node)
|
||||
return component;
|
||||
} else if (name && strcmp(component->name, name) == 0) {
|
||||
return component;
|
||||
|
@ -960,7 +965,7 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order)
|
|||
{
|
||||
int err;
|
||||
|
||||
if (!dai || !dai->probed ||
|
||||
if (!dai || !dai->probed || !dai->driver ||
|
||||
dai->driver->remove_order != order)
|
||||
return;
|
||||
|
||||
|
|
|
@ -70,12 +70,16 @@ static int dapm_up_seq[] = {
|
|||
[snd_soc_dapm_clock_supply] = 1,
|
||||
[snd_soc_dapm_supply] = 2,
|
||||
[snd_soc_dapm_micbias] = 3,
|
||||
[snd_soc_dapm_vmid] = 3,
|
||||
[snd_soc_dapm_dai_link] = 2,
|
||||
[snd_soc_dapm_dai_in] = 4,
|
||||
[snd_soc_dapm_dai_out] = 4,
|
||||
[snd_soc_dapm_aif_in] = 4,
|
||||
[snd_soc_dapm_aif_out] = 4,
|
||||
[snd_soc_dapm_mic] = 5,
|
||||
[snd_soc_dapm_siggen] = 5,
|
||||
[snd_soc_dapm_input] = 5,
|
||||
[snd_soc_dapm_output] = 5,
|
||||
[snd_soc_dapm_mux] = 6,
|
||||
[snd_soc_dapm_demux] = 6,
|
||||
[snd_soc_dapm_dac] = 7,
|
||||
|
@ -83,11 +87,19 @@ static int dapm_up_seq[] = {
|
|||
[snd_soc_dapm_mixer] = 8,
|
||||
[snd_soc_dapm_mixer_named_ctl] = 8,
|
||||
[snd_soc_dapm_pga] = 9,
|
||||
[snd_soc_dapm_buffer] = 9,
|
||||
[snd_soc_dapm_scheduler] = 9,
|
||||
[snd_soc_dapm_effect] = 9,
|
||||
[snd_soc_dapm_src] = 9,
|
||||
[snd_soc_dapm_asrc] = 9,
|
||||
[snd_soc_dapm_encoder] = 9,
|
||||
[snd_soc_dapm_decoder] = 9,
|
||||
[snd_soc_dapm_adc] = 10,
|
||||
[snd_soc_dapm_out_drv] = 11,
|
||||
[snd_soc_dapm_hp] = 11,
|
||||
[snd_soc_dapm_spk] = 11,
|
||||
[snd_soc_dapm_line] = 11,
|
||||
[snd_soc_dapm_sink] = 11,
|
||||
[snd_soc_dapm_kcontrol] = 12,
|
||||
[snd_soc_dapm_post] = 13,
|
||||
};
|
||||
|
@ -100,13 +112,25 @@ static int dapm_down_seq[] = {
|
|||
[snd_soc_dapm_spk] = 3,
|
||||
[snd_soc_dapm_line] = 3,
|
||||
[snd_soc_dapm_out_drv] = 3,
|
||||
[snd_soc_dapm_sink] = 3,
|
||||
[snd_soc_dapm_pga] = 4,
|
||||
[snd_soc_dapm_buffer] = 4,
|
||||
[snd_soc_dapm_scheduler] = 4,
|
||||
[snd_soc_dapm_effect] = 4,
|
||||
[snd_soc_dapm_src] = 4,
|
||||
[snd_soc_dapm_asrc] = 4,
|
||||
[snd_soc_dapm_encoder] = 4,
|
||||
[snd_soc_dapm_decoder] = 4,
|
||||
[snd_soc_dapm_switch] = 5,
|
||||
[snd_soc_dapm_mixer_named_ctl] = 5,
|
||||
[snd_soc_dapm_mixer] = 5,
|
||||
[snd_soc_dapm_dac] = 6,
|
||||
[snd_soc_dapm_mic] = 7,
|
||||
[snd_soc_dapm_siggen] = 7,
|
||||
[snd_soc_dapm_input] = 7,
|
||||
[snd_soc_dapm_output] = 7,
|
||||
[snd_soc_dapm_micbias] = 8,
|
||||
[snd_soc_dapm_vmid] = 8,
|
||||
[snd_soc_dapm_mux] = 9,
|
||||
[snd_soc_dapm_demux] = 9,
|
||||
[snd_soc_dapm_aif_in] = 10,
|
||||
|
|
|
@ -523,6 +523,7 @@ static void remove_dai(struct snd_soc_component *comp,
|
|||
{
|
||||
struct snd_soc_dai_driver *dai_drv =
|
||||
container_of(dobj, struct snd_soc_dai_driver, dobj);
|
||||
struct snd_soc_dai *dai;
|
||||
|
||||
if (pass != SOC_TPLG_PASS_PCM_DAI)
|
||||
return;
|
||||
|
@ -530,6 +531,10 @@ static void remove_dai(struct snd_soc_component *comp,
|
|||
if (dobj->ops && dobj->ops->dai_unload)
|
||||
dobj->ops->dai_unload(comp, dobj);
|
||||
|
||||
list_for_each_entry(dai, &comp->dai_list, list)
|
||||
if (dai->driver == dai_drv)
|
||||
dai->driver = NULL;
|
||||
|
||||
kfree(dai_drv->name);
|
||||
list_del(&dobj->list);
|
||||
kfree(dai_drv);
|
||||
|
|
Loading…
Reference in New Issue