diff options
| author | Yong Goo Yi <yyi@nvidia.com> | 2014-01-09 17:03:03 +0900 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-01-12 17:49:00 -0800 |
| commit | ace670ba3e3d87e236e60ff2b98b4be4eab28527 (patch) | |
| tree | be2f0c2bfdbaf1048f218ef12871e3eef4603e5b /sound | |
| parent | 2afc8fda56f76e8809e09a7180729e8c18e8589c (diff) | |
soc: tegra: rt5640: set DAI link for E1569-ERS
Set DAI link properly for E1569-ERS rt5640 codec
Bug 1432502
Bug 1432488
Change-Id: I5c91d0cc842fccb45175180da3a86e4651bd2534
Signed-off-by: Yong Goo Yi <yyi@nvidia.com>
Reviewed-on: http://git-master/r/353677
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index a989788e0662..a44deeb5cdfd 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -2,7 +2,7 @@ * tegra_rt5640.c - Tegra machine ASoC driver for boards using ALC5640 codec. * * Author: Johnny Qiu <joqiu@nvidia.com> - * Copyright (c) 2011-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. * * Based on code copyright/by: * @@ -10,7 +10,6 @@ * Author: Graeme Gregory * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com * - * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -1284,10 +1283,10 @@ static struct snd_soc_dai_link tegra_rt5640_dai[NUM_DAI_LINKS] = { [DAI_LINK_HIFI] = { .name = "RT5640", .stream_name = "RT5640 PCM", - .codec_name = "rt5640.4-001c", + .codec_name = "rt5639.0-001c", .platform_name = "tegra-pcm-audio", .cpu_dai_name = "tegra30-i2s.1", - .codec_dai_name = "rt5640-aif1", + .codec_dai_name = "rt5639-aif1", .init = tegra_rt5640_init, .ops = &tegra_rt5640_ops, }, @@ -1456,11 +1455,18 @@ static __devinit int tegra_rt5640_driver_probe(struct platform_device *pdev) ARRAY_SIZE(tegra_rt5640_no_micbias_audio_map); } - if (pdata->codec_name) - card->dai_link->codec_name = pdata->codec_name; - - if (pdata->codec_dai_name) - card->dai_link->codec_dai_name = pdata->codec_dai_name; + if (pdata->codec_name) { + card->dai_link[DAI_LINK_HIFI].codec_name = + pdata->codec_name; + card->dai_link[DAI_LINK_VOICE_CALL].codec_name = + pdata->codec_name; + } + if (pdata->codec_dai_name) { + card->dai_link[DAI_LINK_HIFI].codec_dai_name = + pdata->codec_dai_name; + card->dai_link[DAI_LINK_VOICE_CALL].codec_dai_name = + pdata->codec_dai_name; + } machine = kzalloc(sizeof(struct tegra_rt5640), GFP_KERNEL); if (!machine) { |