summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-07-26 13:51:24 -0600
committerDan Willemsen <dwillemsen@nvidia.com>2012-03-23 15:17:23 -0700
commit92a28dd6a71eed2ad7a84c207ba6784c3cb2159c (patch)
treefc55036ca5f77245bff48b68c3098b9110cde124
parentcd5d50d2fa71cc4648d29a02d5c14e9c33af875f (diff)
ASoC: Tegra: Support Cardhu board in tegra_wm8903.c
Cardhu is a Tegra30 tablet reference design. In terms of audio, it is extremely similar to Harmony/Ventana, except that the WM8903 codec is attached to a different I2C bus ID, and different I2S port. Signed-off-by: Stephen Warren <swarren@nvidia.com> Rebase-Id: Re7572cfde2e359dfb8cf16a5eff38e271f25479d
-rw-r--r--sound/soc/tegra/tegra_wm8903.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 49fa6a48927b..59db57d577e2 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -392,6 +392,11 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
}
machine->pcm_dev = ERR_PTR(-EINVAL);
+ if (machine_is_cardhu()) {
+ tegra_wm8903_dai.codec_name = "wm8903.4-001a",
+ tegra_wm8903_dai.cpu_dai_name = "tegra30-i2s.1";
+ }
+
card->dev = &pdev->dev;
platform_set_drvdata(pdev, card);
snd_soc_card_set_drvdata(card, machine);
@@ -435,7 +440,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
goto err;
}
} else {
- if (machine_is_harmony()) {
+ if (machine_is_harmony() || machine_is_ventana() || machine_is_cardhu()) {
card->dapm_routes = harmony_audio_map;
card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
} else if (machine_is_seaboard()) {