Skip to content

Commit

Permalink
ASoC: clock gating is decided by bool on snd_soc_of_parse_daifmt()
Browse files Browse the repository at this point in the history
ASoC clock gate settings are continuous/gated only.
This patch decides it as bool, then, gated clock will be default.
Special thanks to Stephen

Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jan 30, 2013
1 parent eef28e1 commit 8c2d6a9
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4229,9 +4229,6 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
{ "pdm", SND_SOC_DAIFMT_PDM},
{ "msb", SND_SOC_DAIFMT_MSB },
{ "lsb", SND_SOC_DAIFMT_LSB },
}, of_clock_table[] = {
{ "continuous", SND_SOC_DAIFMT_CONT },
{ "gated", SND_SOC_DAIFMT_GATED },
};

if (!prefix)
Expand All @@ -4253,19 +4250,14 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
}

/*
* check "[prefix]clock-gating = xxx"
* check "[prefix]continuous-clock"
* SND_SOC_DAIFMT_CLOCK_MASK area
*/
snprintf(prop, sizeof(prop), "%sclock-gating", prefix);
ret = of_property_read_string(np, prop, &str);
if (ret == 0) {
for (i = 0; i < ARRAY_SIZE(of_clock_table); i++) {
if (strcmp(str, of_clock_table[i].name) == 0) {
format |= of_clock_table[i].val;
break;
}
}
}
snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);
if (of_get_property(np, prop, NULL))
format |= SND_SOC_DAIFMT_CONT;
else
format |= SND_SOC_DAIFMT_GATED;

/*
* check "[prefix]bitclock-inversion"
Expand Down

0 comments on commit 8c2d6a9

Please sign in to comment.