aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/tegra_i2s.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/tegra/tegra_i2s.c')
-rw-r--r--sound/soc/tegra/tegra_i2s.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 6728fab8c411..33e62fcdfce3 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -42,7 +42,6 @@
42#include <sound/pcm_params.h> 42#include <sound/pcm_params.h>
43#include <sound/soc.h> 43#include <sound/soc.h>
44 44
45#include "tegra_das.h"
46#include "tegra_i2s.h" 45#include "tegra_i2s.h"
47 46
48#define DRV_NAME "tegra-i2s" 47#define DRV_NAME "tegra-i2s"
@@ -363,23 +362,6 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
363 return -EINVAL; 362 return -EINVAL;
364 } 363 }
365 364
366 /*
367 * FIXME: Until a codec driver exists for the tegra DAS, hard-code a
368 * 1:1 mapping between audio controllers and audio ports.
369 */
370 ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1 + pdev->id,
371 TEGRA_DAS_DAP_SEL_DAC1 + pdev->id);
372 if (ret) {
373 dev_err(&pdev->dev, "Can't set up DAP connection\n");
374 return ret;
375 }
376 ret = tegra_das_connect_dac_to_dap(TEGRA_DAS_DAC_ID_1 + pdev->id,
377 TEGRA_DAS_DAC_SEL_DAP1 + pdev->id);
378 if (ret) {
379 dev_err(&pdev->dev, "Can't set up DAC connection\n");
380 return ret;
381 }
382
383 i2s = kzalloc(sizeof(struct tegra_i2s), GFP_KERNEL); 365 i2s = kzalloc(sizeof(struct tegra_i2s), GFP_KERNEL);
384 if (!i2s) { 366 if (!i2s) {
385 dev_err(&pdev->dev, "Can't allocate tegra_i2s\n"); 367 dev_err(&pdev->dev, "Can't allocate tegra_i2s\n");