ASoC: Tegra: Move DAS configuration into machine drivers

This removes potentially machine-specific routing knowledge from the
I2S driverinto the machine drivers, which is better equipped to know
what the appropriate routing configuration is.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index a81cf39257bf..9b0ee1510935 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -249,6 +249,19 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
         struct tegra_wm8903_platform_data *pdata = machine->pdata;
         int ret;
 
+        ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1,
+                                           TEGRA_DAS_DAP_SEL_DAC1);
+        if (ret) {
+                dev_err(card->dev, "Can't set up DAS DAP connection\n");
+                return ret;
+        }
+        ret = tegra_das_connect_dac_to_dap(TEGRA_DAS_DAC_ID_1,
+                                           TEGRA_DAS_DAC_SEL_DAP1);
+        if (ret) {
+                dev_err(card->dev, "Can't set up DAS DAC connection\n");
+                return ret;
+        }
+
         if (gpio_is_valid(pdata->gpio_spkr_en)) {
                 ret = gpio_request(pdata->gpio_spkr_en, "spkr_en");
                 if (ret) {