diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-11-05 03:37:03 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:53 -0800 |
| commit | c415eb414a5bf5e48ffb899b83dbf33bfbc1a48b (patch) | |
| tree | 8062ae6051d8c5cd9c5ec088b78fa16b36ae0525 /sound | |
| parent | 94857c6cc0d0c702d3505491ea9825e924bce801 (diff) | |
ASoC: Tegra: Remove DAS configuration from Tegra20 I2s driver
Bug 872652
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Change-Id: I1813c9a26396819da54fdcf5566078f77a11f40a
Reviewed-on: http://git-master/r/62518
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: Re520964ead6b378773bb7f76738e0e1de19cc538
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra20_i2s.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c index ce4f4e9ad408..0dcea81c50d9 100644 --- a/sound/soc/tegra/tegra20_i2s.c +++ b/sound/soc/tegra/tegra20_i2s.c @@ -394,23 +394,6 @@ static __devinit int tegra20_i2s_platform_probe(struct platform_device *pdev) return -EINVAL; } - /* - * FIXME: Until a codec driver exists for the tegra DAS, hard-code a - * 1:1 mapping between audio controllers and audio ports. - */ - ret = tegra20_das_connect_dap_to_dac(TEGRA20_DAS_DAP_ID_1 + pdev->id, - TEGRA20_DAS_DAP_SEL_DAC1 + pdev->id); - if (ret) { - dev_err(&pdev->dev, "Can't set up DAP connection\n"); - return ret; - } - ret = tegra20_das_connect_dac_to_dap(TEGRA20_DAS_DAC_ID_1 + pdev->id, - TEGRA20_DAS_DAC_SEL_DAP1 + pdev->id); - if (ret) { - dev_err(&pdev->dev, "Can't set up DAC connection\n"); - return ret; - } - i2s = kzalloc(sizeof(struct tegra20_i2s), GFP_KERNEL); if (!i2s) { dev_err(&pdev->dev, "Can't allocate tegra20_i2s\n"); |