[patch 2.6.14-rc2 1/3] alsa: fix HD audio ALC260 mono (un)mute

[patch 2.6.14-rc2 1/3] alsa: fix HD audio ALC260 mono (un)mute

[John W. Linville]

The ALC260 "Mono Playback Switch" is marked as an output in
patch_realtek.c. It actually does not work unless it is marked as an
input. Go figure... This was tested and confirmed on an HP xw4300.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

 sound/pci/hda/patch_realtek.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2243,7 +2243,7 @@ static snd_kcontrol_new_t alc260_base_mi
 	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
 	ALC_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
 	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-	ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_OUTPUT),
+	ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
 	HDA_CODEC_VOLUME("Capture Volume", 0x04, 0x0, HDA_INPUT),
 	HDA_CODEC_MUTE("Capture Switch", 0x04, 0x0, HDA_INPUT),
 	{
@@ -2270,7 +2270,7 @@ static snd_kcontrol_new_t alc260_hp_mixe
 	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
 	ALC_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),
 	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
-	ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_OUTPUT),
+	ALC_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
 	HDA_CODEC_VOLUME("Capture Volume", 0x05, 0x0, HDA_INPUT),
 	HDA_CODEC_MUTE("Capture Switch", 0x05, 0x0, HDA_INPUT),
 	{

[patch 2.6.14-rc2 0/3] HD audio realtek codec fixes

[John W. Linville]

Some simple fixes in patch_realtek.c.

	-- Fix the "sex" of the ALC260 "Mono Playback Switch"

	-- Fix a type in alc880_test_mixer

	-- Fix the "sex" of the ALC882 "LFE Playback Switch"

The last one is speculative based on the datasheet and experience with
the ALC260.  Anyone with ALC882 hardware is invited to test and
confirm.

Patches to follow...

[patch 2.6.14-rc2 3/3] alsa: fix HD audio ALC882 lfe (un)mute

[John W. Linville]

Mark the ALC880 "LFE Playback Switch" as an input, like the other
playback switch settings.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
This is speculative, based on the datasheet and my experience with the
ALC260. I do not have the actual hardware to test this myself. Testing
by others is requested, but I am pretty sure this is correct.

 sound/pci/hda/patch_realtek.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2501,7 +2501,7 @@ static snd_kcontrol_new_t alc882_base_mi
 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
 	ALC_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
-	ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_OUTPUT),
+	ALC_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
 	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
 	ALC_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
 	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),

[patch 2.6.14-rc2 2/3] alsa: fix alc880_test_mixer typo

[John W. Linville]

Fix a typo (cut & paste) in the alc880_test_mixer structure.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

 sound/pci/hda/patch_realtek.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1385,8 +1385,8 @@ static snd_kcontrol_new_t alc880_test_mi
 	HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
 	ALC_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
 	ALC_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
-	ALC_BIND_MUTE("CLFE Playback Volume", 0x0e, 2, HDA_INPUT),
-	ALC_BIND_MUTE("Side Playback Volume", 0x0f, 2, HDA_INPUT),
+	ALC_BIND_MUTE("CLFE Playback Switch", 0x0e, 2, HDA_INPUT),
+	ALC_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
 	PIN_CTL_TEST("Front Pin Mode", 0x14),
 	PIN_CTL_TEST("Surround Pin Mode", 0x15),
 	PIN_CTL_TEST("CLFE Pin Mode", 0x16),

Re: [patch 2.6.14-rc2 0/3] HD audio realtek codec fixes

[Takashi Iwai]

At Wed, 28 Sep 2005 17:50:52 -0400,
John W. Linville wrote:
> 
> Some simple fixes in patch_realtek.c.
> 
> 	-- Fix the "sex" of the ALC260 "Mono Playback Switch"
> 
> 	-- Fix a type in alc880_test_mixer
> 
> 	-- Fix the "sex" of the ALC882 "LFE Playback Switch"
> 
> The last one is speculative based on the datasheet and experience with
> the ALC260.  Anyone with ALC882 hardware is invited to test and
> confirm.
> 
> Patches to follow...

Thanks, all applied to ALSA tree now.


Takashi