diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-05-02 15:17:19 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-13 18:38:17 -0700 |
| commit | 0e3f21cb8aaae12171a908426a9c3487dce4da18 (patch) | |
| tree | fdb02c6e5aa4ad9da9f09ffb70ed7f5c2bddef72 /sound | |
| parent | 64e1800300d6394363e6509cfdf4edc7f766c9e6 (diff) | |
arm: tegra: Exposing more i2s port for Baseband.
Exposed the baseband i2s port for cardhu.
Added separate audio init function.
Change-Id: I9ff38f101c5540ad6e2365ed93a8c88373164ea3
Reviewed-on: http://git-master/r/30087
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_i2s.c | 4 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_soc_wm8903.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c index e4dc4e3c8c19..6bde5f719cf0 100644 --- a/sound/soc/tegra/tegra_i2s.c +++ b/sound/soc/tegra/tegra_i2s.c @@ -468,11 +468,7 @@ static struct platform_driver tegra_i2s_driver = { .probe = tegra_i2s_driver_probe, .remove = __devexit_p(tegra_i2s_driver_remove), .driver = { -#if defined(CONFIG_ARCH_TEGRA_2x_SOC) .name = "i2s", -#else - .name = "audio", -#endif .owner = THIS_MODULE, }, }; diff --git a/sound/soc/tegra/tegra_soc_wm8903.c b/sound/soc/tegra/tegra_soc_wm8903.c index 691c09d91fdf..dcc48cdbc64f 100644 --- a/sound/soc/tegra/tegra_soc_wm8903.c +++ b/sound/soc/tegra/tegra_soc_wm8903.c @@ -613,10 +613,9 @@ static struct snd_soc_dai_link tegra_soc_dai[] = { &tegra_i2s_dai[1], &tegra_generic_codec_dai[1], &tegra_voice_ops), #else -/* FIXME: enabled once these device are enumerated TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-0", "Tegra BB Voice", - &tegra_i2s_dai[2], &tegra_generic_codec_dai[0], - &tegra_voice_ops), */ + &tegra_i2s_dai[1], &tegra_generic_codec_dai[1], + &tegra_voice_ops), TEGRA_CREATE_SOC_DAI_LINK("Tegra-generic-1", "Tegra BT Voice", &tegra_i2s_dai[2], &tegra_generic_codec_dai[2], &tegra_voice_ops), |