diff options
| author | Kuninori Morimoto | 2013-01-30 06:03:36 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-01-30 09:42:31 +0100 |
| commit | 8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21 (patch) | |
| tree | 83d3069fd9fb34caee8373061b1c81c6b747ad3c /sound/soc/soc-core.c | |
| parent | ASoC: SND_SOC_DAIFMT_GATED become 0 as default settings (diff) | |
| download | kernel-qcow2-linux-8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21.tar.gz kernel-qcow2-linux-8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21.tar.xz kernel-qcow2-linux-8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21.zip | |
ASoC: clock gating is decided by bool on snd_soc_of_parse_daifmt()
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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9d07dc03a1d3..b3d75d2c966a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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) @@ -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" |