UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jerome Brunet 2018-07-26 14:45:44 +02:00 committed by Mark Brown
parent d9e8104812
commit 435857e015
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/meson/axg-card.c
View File

@ -123,7 +123,7 @@ static int axg_card_add_aux_devices(struct snd_soc_card *card)
struct snd_soc_aux_dev *aux; struct snd_soc_aux_dev *aux;
int num, i; 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) { if (num == -ENOENT) {
/* /*
* It is ok to have no auxiliary devices but for this card it * 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; card->num_aux_devs = num;
for (i = 0; i < card->num_aux_devs; i++, aux++) { for (i = 0; i < card->num_aux_devs; i++, aux++) {
aux->codec_of_node = of_parse_phandle(node, aux->codec_of_node =
PREFIX "aux-devs", i); of_parse_phandle(node, "audio-aux-devs", i);
if (!aux->codec_of_node) if (!aux->codec_of_node)
return -EINVAL; return -EINVAL;
} }
@ -610,18 +610,18 @@ static int axg_card_probe(struct platform_device *pdev)
priv->card.owner = THIS_MODULE; priv->card.owner = THIS_MODULE;
priv->card.dev = dev; 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) if (ret < 0)
return ret; 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); snd_soc_of_parse_audio_routing);
if (ret) { if (ret) {
dev_err(dev, "error while parsing routing\n"); dev_err(dev, "error while parsing routing\n");
return ret; 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); snd_soc_of_parse_audio_simple_widgets);
if (ret) { if (ret) {
dev_err(dev, "error while parsing widgets\n"); dev_err(dev, "error while parsing widgets\n");