From: broonie@kernel.org (Mark Brown)
To: linus-amlogic@lists.infradead.org
Subject: Applied "ASoC: meson: align axg card driver with DT bindings documentation" to the asoc tree
Date: Thu, 26 Jul 2018 16:01:39 +0100 (BST) [thread overview]
Message-ID: <20180726150139.F013E440078@finisterre.ee.mobilebroadband> (raw)
In-Reply-To: <20180726124544.14740-4-jbrunet@baylibre.com>
The patch
ASoC: meson: align axg card driver with DT bindings documentation
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 435857e015dc7b337c5f21d195ac2e4ffd694283 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Thu, 26 Jul 2018 14:45:44 +0200
Subject: [PATCH] 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>
---
sound/soc/meson/axg-card.c | 12 ++++++------
1 file 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");
--
2.18.0
prev parent reply other threads:[~2018-07-26 15:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 12:45 [PATCH 0/3] ASoC: meson-axg: fifo and card fixup Jerome Brunet
2018-07-26 12:45 ` [PATCH 1/3] ASoC: meson: use IRQ_RETVAL in the fifo irq handler Jerome Brunet
2018-07-26 15:02 ` Applied "ASoC: meson: use IRQ_RETVAL in the fifo irq handler" to the asoc tree Mark Brown
2018-07-26 12:45 ` [PATCH 2/3] ASoC: meson: update axg sound card bindings Jerome Brunet
2018-07-26 15:01 ` Applied "ASoC: meson: update axg sound card bindings" to the asoc tree Mark Brown
2018-07-26 12:45 ` [PATCH 3/3] ASoC: meson: align axg card driver with DT bindings documentation Jerome Brunet
2018-07-26 15:01 ` Mark Brown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180726150139.F013E440078@finisterre.ee.mobilebroadband \
--to=broonie@kernel.org \
--cc=linus-amlogic@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®