diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-01-06 20:15:16 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-07 10:43:13 -0500 |
commit | 8c0b8230b2d9708eed5b50f9f8442aaa879a3c57 (patch) | |
tree | 1aaa7fb2335036cca32e6d5f0d7f5c430d94fbff /sound | |
parent | f87a3e825cb0f7d4d51556ece147f1a6299ac1af (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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/generic/simple-card.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index eb95beb25d43..0430be85f23c 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, | |||
134 | (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); | 134 | (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK); |
135 | 135 | ||
136 | /* DAPM routes */ | 136 | /* DAPM routes */ |
137 | if (of_property_read_bool(node, "simple-audio-routing")) { | 137 | if (of_property_read_bool(node, "simple-audio-card,routing")) { |
138 | ret = snd_soc_of_parse_audio_routing(&info->snd_card, | 138 | ret = snd_soc_of_parse_audio_routing(&info->snd_card, |
139 | "simple-audio-routing"); | 139 | "simple-audio-card,routing"); |
140 | if (ret) | 140 | if (ret) |
141 | return ret; | 141 | return ret; |
142 | } | 142 | } |