diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-01-07 09:15:16 +0800 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-06-30 10:13:03 +0100 |
| commit | 6e60dba276b216e9c540b82ad57681cc85460d91 (patch) | |
| tree | 9a1e7856557147061c1023058fd5c803d682aa05 | |
| parent | f964fca02180dcadc525962733afad6ada94a2e3 (diff) | |
ASoC: simple-card: keep the property's name the same pattern
Even though we might not have rigor rule for the simple card property names,
according to the existing ones, they are all in a same pattern:
[simple-audio-card,]XXX;
Rename simple-audio-routing to simple-audio-card,routing, and make the simple
card's properties has one unified name.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 8c0b8230b2d9708eed5b50f9f8442aaa879a3c57)
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/simple-card.txt | 2 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index 2ee80c76ca64..e9e20ec67d62 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -11,7 +11,7 @@ Optional properties: - simple-audio-card,format : CPU/CODEC common audio format. "i2s", "right_j", "left_j" , "dsp_a" "dsp_b", "ac97", "pdm", "msb", "lsb" -- simple-audio-routing : A list of the connections between audio components. +- simple-audio-card,routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, the second being the connection's source. diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 5addb1accc6a..e473dc9537e5 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -134,9 +134,9 @@ static int asoc_simple_card_parse_of(struct device_node *node, (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); /* DAPM routes */ - if (of_property_read_bool(node, "simple-audio-routing")) { + if (of_property_read_bool(node, "simple-audio-card,routing")) { ret = snd_soc_of_parse_audio_routing(&info->snd_card, - "simple-audio-routing"); + "simple-audio-card,routing"); if (ret) return ret; } |