Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
	Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>
Subject: Applied "ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink()" to the asoc tree
Date: Tue, 09 Aug 2016 13:43:46 +0100	[thread overview]
Message-ID: <E1bX6Nm-0003Uf-0X@debutante> (raw)
In-Reply-To: <87eg5y7b23.wl%kuninori.morimoto.gx@renesas.com>

The patch

   ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink()

has been applied to the asoc tree at

   git://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 a09f383ef72947b7d59fc7fe50fe332ab5c35dca Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 9 Aug 2016 05:50:19 +0000
Subject: [PATCH] ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sh/rcar/rsrc-card.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 1bf35634ebba..0bf17dae2b64 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -222,8 +222,10 @@ static int rsrc_card_parse_links(struct device_node *np,
 		}
 	}
 
-	/* Simple Card assumes platform == cpu */
-	dai_link->platform_of_node	= dai_link->cpu_of_node;
+	ret = asoc_simple_card_canonicalize_dailink(dai_link);
+	if (ret < 0)
+		return ret;
+
 	dai_link->dpcm_playback		= 1;
 	dai_link->dpcm_capture		= 1;
 	dai_link->ops			= &rsrc_card_ops;
-- 
2.8.1

      reply	other threads:[~2016-08-09 12:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-09  5:47 [PATCH 0/6] ASoC: simple-card: add init_dai / canonicalize_dailink Kuninori Morimoto
2016-08-09  5:48 ` [PATCH 1/6] ASoC: simple-card-utils: add asoc_simple_card_init_dai() Kuninori Morimoto
2016-08-09 12:44   ` Applied "ASoC: simple-card-utils: add asoc_simple_card_init_dai()" to the asoc tree Mark Brown
2016-08-09  5:48 ` [PATCH 2/6] ASoC: simple-card: use asoc_simple_card_init_dai() Kuninori Morimoto
2016-08-09  5:49 ` [PATCH 3/6] ASoC: rsrc-card: " Kuninori Morimoto
2016-08-09  5:49 ` [PATCH 4/6] ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-08-09 12:43   ` Applied "ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink()" to the asoc tree Mark Brown
2016-08-09  5:50 ` [PATCH 5/6] ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-08-09 12:43   ` Applied "ASoC: simple-card: use asoc_simple_card_canonicalize_dailink()" to the asoc tree Mark Brown
2016-08-09  5:50 ` [PATCH 6/6] ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() Kuninori Morimoto
2016-08-09 12:43   ` 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=E1bX6Nm-0003Uf-0X@debutante \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=horms@verge.net.au \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    /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