redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: simple-card: add simple_parse_mclk_fs() 

It is parsing mclk_fs at many places, but it should be
same operation. This patch adds simple_parse_mclk_fs()
and parse it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.2
Kuninori Morimoto 2019-03-18 13:50:17 +09:00 committed by Mark Brown
parent cdc444721b
commit d708d35ef0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/soc/generic/simple-card.c
View File

@ -187,6 +187,26 @@ static void simple_parse_convert(struct device *dev,
of_node_put(node);
}
static void simple_parse_mclk_fs(struct device_node *top,
struct device_node *cpu,
struct device_node *codec,
struct simple_dai_props *props,
char *prefix)
{
struct device_node *node = of_get_parent(cpu);
char prop[128];
snprintf(prop, sizeof(prop), "%smclk-fs", PREFIX);
of_property_read_u32(top, prop, &props->mclk_fs);
snprintf(prop, sizeof(prop), "%smclk-fs", prefix);
of_property_read_u32(node, prop, &props->mclk_fs);
of_property_read_u32(cpu, prop, &props->mclk_fs);
of_property_read_u32(codec, prop, &props->mclk_fs);
of_node_put(node);
}
static int simple_dai_link_of_dpcm(struct simple_priv *priv,
struct device_node *np,
struct device_node *codec,
@ -200,7 +220,6 @@ static int simple_dai_link_of_dpcm(struct simple_priv *priv,
struct snd_soc_dai_link_component *codecs = dai_link->codecs;
struct device_node *top = dev->of_node;
struct device_node *node = of_get_parent(np);
char prop[128];
char *prefix = "";
int ret;
@ -296,6 +315,7 @@ static int simple_dai_link_of_dpcm(struct simple_priv *priv,
}
simple_parse_convert(dev, np, &dai_props->adata);
simple_parse_mclk_fs(top, np, codec, dai_props, prefix);
asoc_simple_card_canonicalize_platform(dai_link);
@ -303,11 +323,6 @@ static int simple_dai_link_of_dpcm(struct simple_priv *priv,
if (ret)
return ret;
snprintf(prop, sizeof(prop), "%smclk-fs", prefix);
of_property_read_u32(top, PREFIX "mclk-fs", &dai_props->mclk_fs);
of_property_read_u32(node, prop, &dai_props->mclk_fs);
of_property_read_u32(np, prop, &dai_props->mclk_fs);
ret = asoc_simple_card_parse_daifmt(dev, node, codec,
prefix, &dai_link->dai_fmt);
if (ret < 0)
@ -372,11 +387,7 @@ static int simple_dai_link_of(struct simple_priv *priv,
if (ret < 0)
goto dai_link_of_err;
snprintf(prop, sizeof(prop), "%smclk-fs", prefix);
of_property_read_u32(top, PREFIX "mclk-fs", &dai_props->mclk_fs);
of_property_read_u32(node, prop, &dai_props->mclk_fs);
of_property_read_u32(cpu, prop, &dai_props->mclk_fs);
of_property_read_u32(codec, prop, &dai_props->mclk_fs);
simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix);
ret = asoc_simple_card_parse_cpu(cpu, dai_link,
DAI, CELL, &single_cpu);