FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 04:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: Tegra: Move DAS configuration into machine drivers

Browse Source 
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>
This commit is contained in:
Stephen Warren 2011-11-22 18:21:13 -07:00 committed by Mark Brown
parent f2296d7bf1
commit 65713ce844
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/tegra/tegra_i2s.c
View File

@ -42,7 +42,6 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include "tegra_das.h"
#include "tegra_i2s.h"
#define DRV_NAME "tegra-i2s"
@ -363,23 +362,6 @@ static __devinit int tegra_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 = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1 + pdev->id,
TEGRA_DAS_DAP_SEL_DAC1 + pdev->id);
if (ret) {
dev_err(&pdev->dev, "Can't set up DAP connection\n");
return ret;
}
ret = tegra_das_connect_dac_to_dap(TEGRA_DAS_DAC_ID_1 + pdev->id,
TEGRA_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 tegra_i2s), GFP_KERNEL);
if (!i2s) {
dev_err(&pdev->dev, "Can't allocate tegra_i2s\n");

13
sound/soc/tegra/tegra_wm8903.c
View File

@ -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) {

15
sound/soc/tegra/trimslice.c
View File

@ -118,7 +118,22 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = {
static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_card *card = codec->card;
struct snd_soc_dapm_context *dapm = &codec->dapm;
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;
}
snd_soc_dapm_nc_pin(dapm, "LHPOUT");
snd_soc_dapm_nc_pin(dapm, "RHPOUT");