mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Taylor Hutt <thutt@chromium.org>
To: thutt@chromium.org
Cc: miletus@chromium.org, swarren@nvidia.com,
	Liam Girdwood <lrg@slimlogic.co.uk>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ASoc : Tegra : Add audio map for Asymptote
Date: Tue,  1 Nov 2011 09:32:53 -0700	[thread overview]
Message-ID: <1320165173-3951-1-git-send-email-thutt@chromium.org> (raw)

Details

  Add pin connections and audio map for the Asymptote board.

Testing

  Visual inspection with Chromium OS 2.6.38 code.
  Built kernel
  Built chromium os image
  Booted image on asymptote
  Booted image on kaen

Signed-off-by: Taylor Hutt <thutt@chromium.org>
---
 sound/soc/tegra/tegra_wm8903.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index b0aef55..e0beeda 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -310,6 +310,7 @@ static void tegra_wm8903_disconnect_pins(struct snd_soc_card *card,
 {
 #define MACHINES                               \
 	M(aebl)                                 \
+	M(asymptote)                            \
 	M(harmony)                              \
 	M(kaen)                                 \
 	M(seaboard)                             \
@@ -355,6 +356,7 @@ static void tegra_wm8903_disconnect_pins(struct snd_soc_card *card,
 			CONNECT(ventana),
 			CONNECT(seaboard),
 			CONNECT(kaen),
+			CONNECT(asymptote),
 		},
 		{
 			.name = "RON",
@@ -362,6 +364,7 @@ static void tegra_wm8903_disconnect_pins(struct snd_soc_card *card,
 			CONNECT(ventana),
 			CONNECT(seaboard),
 			CONNECT(kaen),
+			CONNECT(asymptote),
 		},
 		{
 			.name = "ROP",
@@ -369,6 +372,7 @@ static void tegra_wm8903_disconnect_pins(struct snd_soc_card *card,
 			CONNECT(ventana),
 			CONNECT(seaboard),
 			CONNECT(kaen),
+			CONNECT(asymptote),
 		},
 		{
 			.name = "LOP",
@@ -376,6 +380,7 @@ static void tegra_wm8903_disconnect_pins(struct snd_soc_card *card,
 			CONNECT(ventana),
 			CONNECT(seaboard),
 			CONNECT(kaen),
+			CONNECT(asymptote),
 		},
 		{
 			.name = "LINEOUTR",
@@ -544,13 +549,14 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)
 	if (machine_is_harmony() || machine_is_ventana()) {
 		card->dapm_routes = harmony_audio_map;
 		card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
-	} else if (machine_is_seaboard()) {
+	} else if (machine_is_seaboard() || machine_is_asymptote()) {
 		card->dapm_routes = seaboard_audio_map;
 		card->num_dapm_routes = ARRAY_SIZE(seaboard_audio_map);
 	} else if (machine_is_kaen()) {
 		card->dapm_routes = kaen_audio_map;
 		card->num_dapm_routes = ARRAY_SIZE(kaen_audio_map);
 	} else {
+		BUG_ON(!machine_is_aebl());
 		card->dapm_routes = aebl_audio_map;
 		card->num_dapm_routes = ARRAY_SIZE(aebl_audio_map);
 	}
-- 
1.7.3.1


             reply	other threads:[~2011-11-01 16:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-01 16:32 Taylor Hutt [this message]
2011-11-01 16:55 ` Stephen Warren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320165173-3951-1-git-send-email-thutt@chromium.org \
    --to=thutt@chromium.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    --cc=miletus@chromium.org \
    --cc=perex@perex.cz \
    --cc=swarren@nvidia.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®