summaryrefslogtreecommitdiff
path: root/sound/soc/meson
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2018-07-26 14:45:44 +0200
committerMark Brown <broonie@kernel.org>2018-07-26 15:45:44 +0100
commit435857e015dc7b337c5f21d195ac2e4ffd694283 (patch)
tree48f82d1cd95b0f37e849e360606a140394094193 /sound/soc/meson
parentd9e81048127604fe6373fb76181fefcf218965f4 (diff)
ASoC: meson: align axg card driver with DT bindings documentation
Drop amlogic prefix in front of the generic DT properties and change property "name" to "model". Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/meson')
-rw-r--r--sound/soc/meson/axg-card.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index d6d1081d94ad..2914ba0d965b 100644
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -123,7 +123,7 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card)
struct snd_soc_aux_dev *aux;
int num, i;
- num = of_count_phandle_with_args(node, PREFIX "aux-devs", NULL);
+ num = of_count_phandle_with_args(node, "audio-aux-devs", NULL);
if (num == -ENOENT) {
/*
* It is ok to have no auxiliary devices but for this card it
@@ -144,8 +144,8 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card)
card->num_aux_devs = num;
for (i = 0; i < card->num_aux_devs; i++, aux++) {
- aux->codec_of_node = of_parse_phandle(node,
- PREFIX "aux-devs", i);
+ aux->codec_of_node =
+ of_parse_phandle(node, "audio-aux-devs", i);
if (!aux->codec_of_node)
return -EINVAL;
}
@@ -610,18 +610,18 @@ static int axg_card_probe(struct platform_device *pdev)
priv->card.owner = THIS_MODULE;
priv->card.dev = dev;
- ret = snd_soc_of_parse_card_name(&priv->card, PREFIX "name");
+ ret = snd_soc_of_parse_card_name(&priv->card, "model");
if (ret < 0)
return ret;
- ret = axg_card_parse_of_optional(&priv->card, PREFIX "routing",
+ ret = axg_card_parse_of_optional(&priv->card, "audio-routing",
snd_soc_of_parse_audio_routing);
if (ret) {
dev_err(dev, "error while parsing routing\n");
return ret;
}
- ret = axg_card_parse_of_optional(&priv->card, PREFIX "widgets",
+ ret = axg_card_parse_of_optional(&priv->card, "audio-widgets",
snd_soc_of_parse_audio_simple_widgets);
if (ret) {
dev_err(dev, "error while parsing widgets\n");