[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 1e257a0e99817a338e3706708ebb5036518e46d8
Author: Matt Hsu <matt_hsu at openmoko.org>
Date:   Wed Mar 11 11:25:26 2009 +0000

    Add proper audio route for headphone speaker in 3d7k.
    
    The power mode of ROUT1 is always off which results
    in the voice only comes from left channel (LOUT1).
    This issues is fixed by adding dapm control for ROU1 channel.
    
    Signed-off-by: Matt Hsu <matt_hsu at openmoko.org>
    Reported-by: Candy Chou <candy_chou at openmoko.com>

diff --git a/sound/soc/s3c24xx/om_3d7k_wm8753.c b/sound/soc/s3c24xx/om_3d7k_wm8753.c
index 6a49cf8..82238d0 100644
--- a/sound/soc/s3c24xx/om_3d7k_wm8753.c
+++ b/sound/soc/s3c24xx/om_3d7k_wm8753.c
@@ -369,6 +369,30 @@ static int om_3d7k_get_handset_spk(struct snd_kcontrol *kcontrol,
 	return 0;
 }
 
+static int om_3d7k_set_headset_spk(struct snd_kcontrol *kcontrol,
+				    struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+	int val = ucontrol->value.integer.value[0];
+
+	snd_soc_dapm_set_endpoint(codec, "Headset Spk", val);
+
+	snd_soc_dapm_sync(codec);
+
+	return 0;
+}
+
+static int om_3d7k_get_headset_spk(struct snd_kcontrol *kcontrol,
+				    struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+
+	ucontrol->value.integer.value[0] =
+		snd_soc_dapm_get_endpoint(codec, "Headset Spk");
+
+	return 0;
+}
+
 static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
 	SND_SOC_DAPM_LINE("Stereo Out", NULL),
 	SND_SOC_DAPM_LINE("GSM Line Out", NULL),
@@ -376,6 +400,7 @@ static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
 	SND_SOC_DAPM_MIC("Headset Mic", NULL),
 	SND_SOC_DAPM_MIC("Handset Mic", NULL),
 	SND_SOC_DAPM_SPK("Handset Spk", NULL),
+	SND_SOC_DAPM_SPK("Headset Spk", NULL),
 };
 
 
@@ -404,6 +429,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
 	{"Handset Spk", NULL, "OUT3"},
 	{"Handset Spk", NULL, "LOUT1"},
 
+	{"Headset Spk", NULL, "ROUT1"},
+	{"Headset Spk", NULL, "LOUT1"},
+
 	/* Connect the ALC pins */
 	{"ACIN", NULL, "ACOP"},
 };
@@ -427,6 +455,9 @@ static const struct snd_kcontrol_new wm8753_om_3d7k_controls[] = {
 	SOC_SINGLE_EXT("DAPM Handset Spk Switch", 5, 0, 1, 0,
 		om_3d7k_get_handset_spk,
 		om_3d7k_set_handset_spk),
+	SOC_SINGLE_EXT("DAPM Headset Spk Switch", 6, 0, 1, 0,
+		om_3d7k_get_headset_spk,
+		om_3d7k_set_headset_spk),
 };
 
 /*
@@ -466,6 +497,7 @@ static int om_3d7k_wm8753_init(struct snd_soc_codec *codec)
 	snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0);
 	snd_soc_dapm_set_endpoint(codec, "Handset Mic", 0);
 	snd_soc_dapm_set_endpoint(codec, "Handset Spk", 0);
+	snd_soc_dapm_set_endpoint(codec, "Headset Spk", 0);
 
 	snd_soc_dapm_sync(codec);
 

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko