diff options
| author | Patrick Lai <plai@codeaurora.org> | 2013-06-15 22:50:04 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2013-09-04 17:05:57 -0700 |
| commit | aa373bc6c59d294ee4bc5633debec123090635fd (patch) | |
| tree | 7bd9cdb85d192c209374b6c0d030398bbfd4144f /sound/soc/msm/msm8226.c | |
| parent | 565b0faa02dd2ae76aedacb96462624221ec1229 (diff) | |
ASoC: msm: qdsp6v2: amend AUXPCM DAI Driver device tree definition
By design, primary AUXPCM interface and secondary AUXPCM interface
can run concurrently and have different hardware configuration.
Current device tree definition limits primary and secondary AUXPCM
interfaces to share same hardware configuration. In addition, AUXPCM
is bi-direction audio interface. Hence, device tree definition should
not have to differentiate playback and capture DAI devices.
Amend current device tree definition and CPU DAI driver implementation
to allow concurrency and separate configuration. This change in terms
gets rid of global variables used by AUXPCM CPU DAI driver which is one
of long pending action items. Also, update machine drivers and device
tree files to reflect the new CPU DAI driver names and new device tree
structure.
Change-Id: Ifb5a2c8d594f98f07a58829801a43adb7b31ca90
CRs-fixed: 493140, 493741
Signed-off-by: Patrick Lai <plai@codeaurora.org>
Diffstat (limited to 'sound/soc/msm/msm8226.c')
| -rw-r--r-- | sound/soc/msm/msm8226.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c index 9dac02e531b1..7ea4aa6c7efb 100644 --- a/sound/soc/msm/msm8226.c +++ b/sound/soc/msm/msm8226.c @@ -1124,7 +1124,7 @@ static struct snd_soc_dai_link msm8226_dai[] = { { .name = LPASS_BE_AUXPCM_RX, .stream_name = "AUX PCM Playback", - .cpu_dai_name = "msm-dai-q6.4106", + .cpu_dai_name = "msm-dai-q6-auxpcm.1", .platform_name = "msm-pcm-routing", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-rx", @@ -1139,7 +1139,7 @@ static struct snd_soc_dai_link msm8226_dai[] = { { .name = LPASS_BE_AUXPCM_TX, .stream_name = "AUX PCM Capture", - .cpu_dai_name = "msm-dai-q6.4107", + .cpu_dai_name = "msm-dai-q6-auxpcm.1", .platform_name = "msm-pcm-routing", .codec_name = "msm-stub-codec.1", .codec_dai_name = "msm-stub-tx", |