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>
This commit is contained in:
parent
f87a3e825c
commit
8c0b8230b2
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue