Skip to content

Merge/backport v4.20 intel audio 20190125 #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 20 commits into from
Jan 25, 2019
Merged

Merge/backport v4.20 intel audio 20190125 #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3938c73
ASoC: soc-core: defer card probe until all component is added to list
Jan 9, 2019
f8cfeae
ASoC: soc-core: Hold client_mutex around soc_init_dai_link()
rohkkumar Jan 10, 2019
5ff09f2
ASoC: soc-core: fix init platform memory handling
cujomalainey Jan 11, 2019
674e8cf
ASoC: core: Make snd_soc_find_component() more robust
broonie Jan 14, 2019
cf6d25d
ASoC: core: Don't defer probe on optional, NULL components
HiassofT Jan 15, 2019
018a62b
ASoC: soc-core: remove error due to probe deferral
agners Jan 18, 2019
9ff9c48
[BACKPORT] ASoC: generic/simple-card: squash commit
morimoto Nov 6, 2018
1fb4587
ASoC: soc-core: add .num_platform for dai_link
morimoto Jan 21, 2019
d753e6e
ASoC: soc-core: add new snd_soc_flush_all_delayed_work()
morimoto Jan 21, 2019
c69f11d
ASoC: soc-core: merge card resources cleanup method
morimoto Jan 21, 2019
91f0bd9
ASoC: soc-core: reduce if/else nest on soc_probe_link_dais
morimoto Jan 21, 2019
ae58ce0
ASoC: soc-core: add soc_cleanup_component()
morimoto Jan 21, 2019
011797b
ASoC: soc-core: use for_each_link_codecs() for dai_link codecs
morimoto Jan 21, 2019
58d0ead
ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter
shumingfan Jan 22, 2019
a58ec8d
ASoC: core: Fix multi-CODEC setups
broonie Jan 22, 2019
d502f1f
ASoC: soc-core: use for_each_link_codecs() for dai_link codecs
morimoto Jan 21, 2019
9dbaf2c
ASoC: core: Fix multi-CODEC setups
broonie Jan 22, 2019
100122d
ASoC: Intel: make const arrays static, reduces object code size
Jan 24, 2019
f1cc664
ASoC: core: Allow soc_find_component lookups to match parent of_node
charleskeepax Jan 25, 2019
bef770b
Merge branch 'backport/v4.20-intel-audio' into merge/backport-v4.20-i…
plbossart Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/sound/simple_card_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai);
&dai_link->codec_dai_name, \
list_name, cells_name, NULL)
#define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name) \
asoc_simple_card_parse_dai(node, dai_link->platform, \
asoc_simple_card_parse_dai(node, dai_link->platforms, \
&dai_link->platform_of_node, \
NULL, list_name, cells_name, NULL)
int asoc_simple_card_parse_dai(struct device_node *node,
Expand Down Expand Up @@ -116,12 +116,12 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card);

void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,
struct snd_pcm_hw_params *params);
void asoc_simple_card_parse_convert(struct device *dev, char *prefix,
void asoc_simple_card_parse_convert(struct device *dev,
struct device_node *np, char *prefix,
struct asoc_simple_card_data *data);

int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,
char *prefix,
int optional);
char *prefix);
int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,
char *prefix);

Expand Down
9 changes: 8 additions & 1 deletion include/sound/soc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,8 @@ struct snd_soc_dai_link {
*/
const char *platform_name;
struct device_node *platform_of_node;
struct snd_soc_dai_link_component *platform;
struct snd_soc_dai_link_component *platforms;
unsigned int num_platforms;

int id; /* optional ID for machine driver link identification */

Expand Down Expand Up @@ -1021,6 +1022,12 @@ struct snd_soc_dai_link {
/* Do not create a PCM for this DAI link (Backend link) */
unsigned int ignore:1;

/*
* This driver uses legacy platform naming. Set by the core, machine
* drivers should not modify this value.
*/
unsigned int legacy_platform:1;

struct list_head list; /* DAI link list of the soc card */
struct snd_soc_dobj dobj; /* For topology */
};
Expand Down
2 changes: 2 additions & 0 deletions sound/soc/codecs/rt5682.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},

Expand Down
6 changes: 3 additions & 3 deletions sound/soc/fsl/fsl-asoc-card.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,17 +571,17 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
}

/* Common settings for corresponding Freescale CPU DAI driver */
if (strstr(cpu_np->name, "ssi")) {
if (of_node_name_eq(cpu_np, "ssi")) {
/* Only SSI needs to configure AUDMUX */
ret = fsl_asoc_card_audmux_init(np, priv);
if (ret) {
dev_err(&pdev->dev, "failed to init audmux\n");
goto asrc_fail;
}
} else if (strstr(cpu_np->name, "esai")) {
} else if (of_node_name_eq(cpu_np, "esai")) {
priv->cpu_priv.sysclk_id[1] = ESAI_HCKT_EXTAL;
priv->cpu_priv.sysclk_id[0] = ESAI_HCKR_EXTAL;
} else if (strstr(cpu_np->name, "sai")) {
} else if (of_node_name_eq(cpu_np, "sai")) {
priv->cpu_priv.sysclk_id[1] = FSL_SAI_CLK_MAST1;
priv->cpu_priv.sysclk_id[0] = FSL_SAI_CLK_MAST1;
}
Expand Down
21 changes: 3 additions & 18 deletions sound/soc/generic/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,13 @@ config SND_SIMPLE_CARD
select SND_SIMPLE_CARD_UTILS
help
This option enables generic simple sound card support

config SND_SIMPLE_SCU_CARD
tristate "ASoC Simple SCU sound card support"
depends on OF
select SND_SIMPLE_CARD_UTILS
help
This option enables generic simple SCU sound card support.
It supports DPCM of multi CPU single Codec system.
It also support DPCM of multi CPU single Codec ststem.

config SND_AUDIO_GRAPH_CARD
tristate "ASoC Audio Graph sound card support"
depends on OF
select SND_SIMPLE_CARD_UTILS
help
This option enables generic simple simple sound card support
with OF-graph DT bindings.

config SND_AUDIO_GRAPH_SCU_CARD
tristate "ASoC Audio Graph SCU sound card support"
depends on OF
select SND_SIMPLE_CARD_UTILS
help
This option enables generic simple SCU sound card support
This option enables generic simple sound card support
with OF-graph DT bindings.
It supports DPCM of multi CPU single Codec ststem.
It also support DPCM of multi CPU single Codec ststem.
4 changes: 0 additions & 4 deletions sound/soc/generic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
snd-soc-simple-card-utils-objs := simple-card-utils.o
snd-soc-simple-card-objs := simple-card.o
snd-soc-simple-scu-card-objs := simple-scu-card.o
snd-soc-audio-graph-card-objs := audio-graph-card.o
snd-soc-audio-graph-scu-card-objs := audio-graph-scu-card.o

obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o
obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o
obj-$(CONFIG_SND_SIMPLE_SCU_CARD) += snd-soc-simple-scu-card.o
obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o
obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD) += snd-soc-audio-graph-scu-card.o
Loading