|
From: Tino K. <tin...@ti...> - 2007-03-14 19:29:45
|
On Wed, Mar 14, 2007 at 11:16:41 -0700, nbo...@us... wrote: > Revision: 86 > http://svn.sourceforge.net/mactel-linux/?rev=86&view=rev > Author: nboichat > Date: 2007-03-14 11:16:40 -0700 (Wed, 14 Mar 2007) > > Log Message: > ----------- > Add sigmatel_audio patch again, 2.6.21 doesn't work with my Macbook Pro. > Number the patches so they get applied in the right order. Hi, I also tested 2.6.21-rc3 on my mini and line-in didn't work out of the box. I'll try again with the patch. Regards, Tino |
|
From: Nicolas B. <ni...@bo...> - 2007-03-15 05:46:04
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, Tino Keitel wrote: > On Wed, Mar 14, 2007 at 11:16:41 -0700, nbo...@us... wrote: >> Revision: 86 >> http://svn.sourceforge.net/mactel-linux/?rev=86&view=rev >> Author: nboichat >> Date: 2007-03-14 11:16:40 -0700 (Wed, 14 Mar 2007) >> >> Log Message: >> ----------- >> Add sigmatel_audio patch again, 2.6.21 doesn't work with my Macbook Pro. >> Number the patches so they get applied in the right order. > > Hi, > > I also tested 2.6.21-rc3 on my mini and line-in didn't work out of the > box. I'll try again with the patch. This patch probably won't help... Did it work before? With which kernel? With or without sigmatel_audio.patch applied? After applying the patch (and checking it still doesn't work), please execute: # dmesg | grep hda_codec You should get something like this: [ 804.570794] hda_codec: STAC922x, Apple subsys_id=106b0200 Then, in sound/pci/hda/patch_sigmatel.c, add these lines at 1903 (just after the switch): case 0x<YOUR subsys_id FROM dmesg>: spec->board_config = XXX; break; Replacing XXX by one of this constants (the first one is the one that has the better chances to work): STAC_D945GTP5 STAC_D945_REF STAC_D945GTP3 STAC_MACBOOK STAC_MACBOOK_PRO_V1 STAC_MACBOOK_PRO_V2 And tell me which one works... (please test the internal speaker too) Thanks a lot, Best regards, Nicolas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF+N1401ajQnpJXgERAvQCAJ41imaL9QMyo/QzScdfhjLwjqpfvgCcDTxY tgjlxQtegAEl7pQJ6nVrIJw= =FRl4 -----END PGP SIGNATURE----- |
|
From: Tino K. <tin...@ti...> - 2007-03-15 08:01:44
|
On Thu, Mar 15, 2007 at 13:45:28 +0800, Nicolas Boichat wrote: > Tino Keitel wrote: [...] > > Hi, > > > > I also tested 2.6.21-rc3 on my mini and line-in didn't work out of the > > box. I'll try again with the patch. > > This patch probably won't help... > > Did it work before? With which kernel? With or without > sigmatel_audio.patch applied? It did work with 2.6.20 and the sigmatel patch from mactel-linux SVN. > > After applying the patch (and checking it still doesn't work), please > execute: > > # dmesg | grep hda_codec > > You should get something like this: > > [ 804.570794] hda_codec: STAC922x, Apple subsys_id=106b0200 > > Then, in sound/pci/hda/patch_sigmatel.c, add these lines at 1903 (just > after the switch): > > case 0x<YOUR subsys_id FROM dmesg>: > spec->board_config = XXX; > break; > > Replacing XXX by one of this constants (the first one is the one that > has the better chances to work): > STAC_D945GTP5 > STAC_D945_REF > STAC_D945GTP3 > STAC_MACBOOK > STAC_MACBOOK_PRO_V1 > STAC_MACBOOK_PRO_V2 > > And tell me which one works... (please test the internal speaker too) OK, I'll try to test it ASAP. Regards, Tino |
|
From: Nicolas B. <ni...@bo...> - 2007-03-15 10:38:55
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, Tino Keitel wrote: > On Thu, Mar 15, 2007 at 13:45:28 +0800, Nicolas Boichat wrote: >> Tino Keitel wrote: > > [...] > >>> Hi, >>> >>> I also tested 2.6.21-rc3 on my mini and line-in didn't work out of the >>> box. I'll try again with the patch. >> This patch probably won't help... >> >> Did it work before? With which kernel? With or without >> sigmatel_audio.patch applied? > > It did work with 2.6.20 and the sigmatel patch from mactel-linux > SVN. > [snip] >> Replacing XXX by one of this constants (the first one is the one that >> has the better chances to work): >> STAC_D945GTP5 >> STAC_D945_REF >> STAC_D945GTP3 >> STAC_MACBOOK >> STAC_MACBOOK_PRO_V1 >> STAC_MACBOOK_PRO_V2 >> >> And tell me which one works... (please test the internal speaker too) > > OK, I'll try to test it ASAP. Considered it worked with the mactel patches, you should try STAC_MACBOOK_PRO_V1 first.... Best regards, Nicolas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF+RwO01ajQnpJXgERApZ2AJ9xNQt2YHhrbOd62ngVorTki1YMagCfRL+Q ZiAZSOB/ah3HRtx+GTM41pU= =spX+ -----END PGP SIGNATURE----- |
|
From: Tino K. <tin...@ti...> - 2007-03-15 18:54:42
|
On Thu, Mar 15, 2007 at 18:12:30 +0800, Nicolas Boichat wrote: [...] > Considered it worked with the mactel patches, you should try > STAC_MACBOOK_PRO_V1 first.... You are right, with STAC_MACBOOK_PRO_V1 I can use all required features. Here are the results: - analog line in works, if "Line In as Output" is muted - analog line out works, it is controlled by the "Front" channel in alsamixer - digital line out works - the internal speaker works, it is controlled by the "Master" channel in alsamixer - the internal speaker is silent if there is an analog plug in line out - the internal speker still works if a (optical) digital cable is plugged in line out, I guess because the optical plastic cable doesn't short circuit the line out plug Minor glitches: There is an input selector that has the options "Line", "Mic" and "Front Mic". However, I think that only "Line" is really usable, as I had so signal when I connected a Mic to line in and a "Front Mic" is also not present in the mini. There is a "Mic as output" switch in alsamixer, but there is not "Mic" jack. Regards, Tino |
|
From: Nicolas B. <ni...@bo...> - 2007-03-16 09:51:24
|
Hi,
I just got this input from a Macmini user (subsys id: 0x106b0800), after
asking him to try different pins settings. (the sound doesn't work
properly with a vanilla 2.6.21-rc3 kernel)
Tino Keitel wrote:
> On Thu, Mar 15, 2007 at 18:12:30 +0800, Nicolas Boichat wrote:
>
> [...]
>
>
>> Considered it worked with the mactel patches, you should try
>> STAC_MACBOOK_PRO_V1 first....
>>
>
> You are right, with STAC_MACBOOK_PRO_V1 I can use all required
> features. Here are the results:
>
> - analog line in works, if "Line In as Output" is muted
>
> - analog line out works, it is controlled by the "Front" channel in
> alsamixer
>
> - digital line out works
>
> - the internal speaker works, it is controlled by the "Master" channel
> in alsamixer
>
> - the internal speaker is silent if there is an analog plug in line out
>
> - the internal speker still works if a (optical) digital cable is
> plugged in line out, I guess because the optical plastic cable
> doesn't short circuit the line out plug
>
> Minor glitches:
>
> There is an input selector that has the options "Line", "Mic" and
> "Front Mic". However, I think that only "Line" is really usable, as I
> had so signal when I connected a Mic to line in and a "Front Mic" is
> also not present in the mini.
>
> There is a "Mic as output" switch in alsamixer, but there is not "Mic"
> jack.
>
Considering these pins have been used for a long time on mactel-linux,
and that they are working fine with MacBook (1st generation at least),
Macmini and Macbook Pro (1st generation only), I think the following
patch is appropriate (please apply it after the patch sent yesterday).
Best regards,
Nicolas
Fix audio on Macmini and Macbook.
Signed-off-by: Nicolas Boichat <ni...@bo...>
---
Documentation/sound/alsa/ALSA-Configuration.txt | 5 ++--
sound/pci/hda/patch_sigmatel.c | 27 +++++------------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 438f3fe..c13885a 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -904,9 +904,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
ref Reference board
3stack D945 3stack
5stack D945 5stack + SPDIF
- macmini Intel Mac Mini
- macbook Intel Mac Book
- macbook-pro-v1 Intel Mac Book Pro 1st generation
+ mac Intel Mac
+ (Mac Mini, Mac Book, Mac Book Pro 1st generation)
macbook-pro Intel Mac Book Pro 2nd generation
STAC9202/9250/9251
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 2d78a9f..1293632 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -58,9 +58,7 @@ enum {
STAC_D945_REF,
STAC_D945GTP3,
STAC_D945GTP5,
- STAC_MACMINI,
- STAC_MACBOOK,
- STAC_MACBOOK_PRO_V1,
+ STAC_MAC,
STAC_MACBOOK_PRO_V2,
STAC_922X_MODELS
};
@@ -524,13 +522,7 @@ static unsigned int d945gtp5_pin_configs[10] = {
0x02a19320, 0x40000100,
};
-static unsigned int macbook_pin_configs[10] = {
- 0x0321e230, 0x03a1e020, 0x400000fd, 0x9017e110,
- 0x400000fe, 0x0381e021, 0x1345e240, 0x13c5e22e,
- 0x400000fc, 0x400000fb,
-};
-
-static unsigned int macbook_pro_v1_pin_configs[10] = {
+static unsigned int mac_pin_configs[10] = {
0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
0x02a19320, 0x400000fb
@@ -546,9 +538,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
[STAC_D945_REF] = ref922x_pin_configs,
[STAC_D945GTP3] = d945gtp3_pin_configs,
[STAC_D945GTP5] = d945gtp5_pin_configs,
- [STAC_MACMINI] = d945gtp5_pin_configs,
- [STAC_MACBOOK] = macbook_pin_configs,
- [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
+ [STAC_MAC] = mac_pin_configs,
[STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
};
@@ -556,9 +546,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
[STAC_D945_REF] = "ref",
[STAC_D945GTP5] = "5stack",
[STAC_D945GTP3] = "3stack",
- [STAC_MACMINI] = "macmini",
- [STAC_MACBOOK] = "macbook",
- [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1",
+ [STAC_MAC] = "mac",
[STAC_MACBOOK_PRO_V2] = "macbook-pro",
};
@@ -622,7 +610,7 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
/* other systems */
/* Apple Mac Mini (early 2006) */
SND_PCI_QUIRK(0x8384, 0x7680,
- "Mac Mini", STAC_MACMINI),
+ "Intel Mac", STAC_MAC),
{} /* terminator */
};
@@ -1893,16 +1881,13 @@ static int patch_stac922x(struct hda_codec *codec)
spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
stac922x_models,
stac922x_cfg_tbl);
- if (spec->board_config == STAC_MACMINI) {
+ if (spec->board_config == STAC_MAC) {
spec->gpio_mute = 1;
/* Intel Macs have all same PCI SSID, so we need to check
* codec SSID to distinguish the exact models
*/
printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n", codec->subsystem_id);
switch (codec->subsystem_id) {
- case 0x106b0200: /* MacBook Pro first generation */
- spec->board_config = STAC_MACBOOK_PRO_V1;
- break;
case 0x106b1e00: /* MacBook Pro second generation */
spec->board_config = STAC_MACBOOK_PRO_V2;
break;
|
|
From: Takashi I. <ti...@su...> - 2007-03-16 11:08:23
|
At Fri, 16 Mar 2007 17:50:33 +0800,
Nicolas Boichat wrote:
>
> Hi,
>
> I just got this input from a Macmini user (subsys id: 0x106b0800), after
> asking him to try different pins settings. (the sound doesn't work
> properly with a vanilla 2.6.21-rc3 kernel)
>
> Tino Keitel wrote:
> > On Thu, Mar 15, 2007 at 18:12:30 +0800, Nicolas Boichat wrote:
> >
> > [...]
> >
> >
> >> Considered it worked with the mactel patches, you should try
> >> STAC_MACBOOK_PRO_V1 first....
> >>
> >
> > You are right, with STAC_MACBOOK_PRO_V1 I can use all required
> > features. Here are the results:
> >
> > - analog line in works, if "Line In as Output" is muted
> >
> > - analog line out works, it is controlled by the "Front" channel in
> > alsamixer
> >
> > - digital line out works
> >
> > - the internal speaker works, it is controlled by the "Master" channel
> > in alsamixer
> >
> > - the internal speaker is silent if there is an analog plug in line out
> >
> > - the internal speker still works if a (optical) digital cable is
> > plugged in line out, I guess because the optical plastic cable
> > doesn't short circuit the line out plug
> >
> > Minor glitches:
> >
> > There is an input selector that has the options "Line", "Mic" and
> > "Front Mic". However, I think that only "Line" is really usable, as I
> > had so signal when I connected a Mic to line in and a "Front Mic" is
> > also not present in the mini.
> >
> > There is a "Mic as output" switch in alsamixer, but there is not "Mic"
> > jack.
> >
> Considering these pins have been used for a long time on mactel-linux,
Grrr, someone should have informed us. I didn't know of this.
> and that they are working fine with MacBook (1st generation at least),
> Macmini and Macbook Pro (1st generation only), I think the following
> patch is appropriate (please apply it after the patch sent yesterday).
But the glitches above don't appear on your macbook-pro-v1, right?
Then I suppose macmini requires slightly different pin configs for
inputs. As for now, I think it's OK to use macbook-pro-v1 pin configs
for macmini since it's much better. So, how about to just keep the
models and change the pin definitions to use the same table?
thanks,
Takashi
>
> Best regards,
>
> Nicolas
>
> Fix audio on Macmini and Macbook.
>
> Signed-off-by: Nicolas Boichat <ni...@bo...>
>
> ---
>
> Documentation/sound/alsa/ALSA-Configuration.txt | 5 ++--
> sound/pci/hda/patch_sigmatel.c | 27 +++++------------------
> 2 files changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
> index 438f3fe..c13885a 100644
> --- a/Documentation/sound/alsa/ALSA-Configuration.txt
> +++ b/Documentation/sound/alsa/ALSA-Configuration.txt
> @@ -904,9 +904,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
> ref Reference board
> 3stack D945 3stack
> 5stack D945 5stack + SPDIF
> - macmini Intel Mac Mini
> - macbook Intel Mac Book
> - macbook-pro-v1 Intel Mac Book Pro 1st generation
> + mac Intel Mac
> + (Mac Mini, Mac Book, Mac Book Pro 1st generation)
> macbook-pro Intel Mac Book Pro 2nd generation
>
> STAC9202/9250/9251
> diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
> index 2d78a9f..1293632 100644
> --- a/sound/pci/hda/patch_sigmatel.c
> +++ b/sound/pci/hda/patch_sigmatel.c
> @@ -58,9 +58,7 @@ enum {
> STAC_D945_REF,
> STAC_D945GTP3,
> STAC_D945GTP5,
> - STAC_MACMINI,
> - STAC_MACBOOK,
> - STAC_MACBOOK_PRO_V1,
> + STAC_MAC,
> STAC_MACBOOK_PRO_V2,
> STAC_922X_MODELS
> };
> @@ -524,13 +522,7 @@ static unsigned int d945gtp5_pin_configs[10] = {
> 0x02a19320, 0x40000100,
> };
>
> -static unsigned int macbook_pin_configs[10] = {
> - 0x0321e230, 0x03a1e020, 0x400000fd, 0x9017e110,
> - 0x400000fe, 0x0381e021, 0x1345e240, 0x13c5e22e,
> - 0x400000fc, 0x400000fb,
> -};
> -
> -static unsigned int macbook_pro_v1_pin_configs[10] = {
> +static unsigned int mac_pin_configs[10] = {
> 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
> 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
> 0x02a19320, 0x400000fb
> @@ -546,9 +538,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
> [STAC_D945_REF] = ref922x_pin_configs,
> [STAC_D945GTP3] = d945gtp3_pin_configs,
> [STAC_D945GTP5] = d945gtp5_pin_configs,
> - [STAC_MACMINI] = d945gtp5_pin_configs,
> - [STAC_MACBOOK] = macbook_pin_configs,
> - [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
> + [STAC_MAC] = mac_pin_configs,
> [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
> };
>
> @@ -556,9 +546,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
> [STAC_D945_REF] = "ref",
> [STAC_D945GTP5] = "5stack",
> [STAC_D945GTP3] = "3stack",
> - [STAC_MACMINI] = "macmini",
> - [STAC_MACBOOK] = "macbook",
> - [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1",
> + [STAC_MAC] = "mac",
> [STAC_MACBOOK_PRO_V2] = "macbook-pro",
> };
>
> @@ -622,7 +610,7 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
> /* other systems */
> /* Apple Mac Mini (early 2006) */
> SND_PCI_QUIRK(0x8384, 0x7680,
> - "Mac Mini", STAC_MACMINI),
> + "Intel Mac", STAC_MAC),
> {} /* terminator */
> };
>
> @@ -1893,16 +1881,13 @@ static int patch_stac922x(struct hda_codec *codec)
> spec->board_config = snd_hda_check_board_config(codec, STAC_922X_MODELS,
> stac922x_models,
> stac922x_cfg_tbl);
> - if (spec->board_config == STAC_MACMINI) {
> + if (spec->board_config == STAC_MAC) {
> spec->gpio_mute = 1;
> /* Intel Macs have all same PCI SSID, so we need to check
> * codec SSID to distinguish the exact models
> */
> printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n", codec->subsystem_id);
> switch (codec->subsystem_id) {
> - case 0x106b0200: /* MacBook Pro first generation */
> - spec->board_config = STAC_MACBOOK_PRO_V1;
> - break;
> case 0x106b1e00: /* MacBook Pro second generation */
> spec->board_config = STAC_MACBOOK_PRO_V2;
> break;
>
>
|
|
From: Takashi I. <ti...@su...> - 2007-03-16 14:28:58
|
At Fri, 16 Mar 2007 12:08:08 +0100,
I wrote:
>
> At Fri, 16 Mar 2007 17:50:33 +0800,
> Nicolas Boichat wrote:
> >
> > Hi,
> >
> > I just got this input from a Macmini user (subsys id: 0x106b0800), after
> > asking him to try different pins settings. (the sound doesn't work
> > properly with a vanilla 2.6.21-rc3 kernel)
> >
> > Tino Keitel wrote:
> > > On Thu, Mar 15, 2007 at 18:12:30 +0800, Nicolas Boichat wrote:
> > >
> > > [...]
> > >
> > >
> > >> Considered it worked with the mactel patches, you should try
> > >> STAC_MACBOOK_PRO_V1 first....
> > >>
> > >
> > > You are right, with STAC_MACBOOK_PRO_V1 I can use all required
> > > features. Here are the results:
> > >
> > > - analog line in works, if "Line In as Output" is muted
> > >
> > > - analog line out works, it is controlled by the "Front" channel in
> > > alsamixer
> > >
> > > - digital line out works
> > >
> > > - the internal speaker works, it is controlled by the "Master" channel
> > > in alsamixer
> > >
> > > - the internal speaker is silent if there is an analog plug in line out
> > >
> > > - the internal speker still works if a (optical) digital cable is
> > > plugged in line out, I guess because the optical plastic cable
> > > doesn't short circuit the line out plug
> > >
> > > Minor glitches:
> > >
> > > There is an input selector that has the options "Line", "Mic" and
> > > "Front Mic". However, I think that only "Line" is really usable, as I
> > > had so signal when I connected a Mic to line in and a "Front Mic" is
> > > also not present in the mini.
> > >
> > > There is a "Mic as output" switch in alsamixer, but there is not "Mic"
> > > jack.
> > >
> > Considering these pins have been used for a long time on mactel-linux,
>
> Grrr, someone should have informed us. I didn't know of this.
>
> > and that they are working fine with MacBook (1st generation at least),
> > Macmini and Macbook Pro (1st generation only), I think the following
> > patch is appropriate (please apply it after the patch sent yesterday).
>
> But the glitches above don't appear on your macbook-pro-v1, right?
> Then I suppose macmini requires slightly different pin configs for
> inputs. As for now, I think it's OK to use macbook-pro-v1 pin configs
> for macmini since it's much better. So, how about to just keep the
> models and change the pin definitions to use the same table?
Well, what I meant is simpler fix like below.
In case, macmini or macbook has any slightly incompatible pin configs,
it can have again its own pin config table easily.
Takashi
diff -r 530b211fffdb pci/hda/patch_sigmatel.c
--- a/pci/hda/patch_sigmatel.c Fri Mar 16 15:01:36 2007 +0100
+++ b/pci/hda/patch_sigmatel.c Fri Mar 16 15:04:06 2007 +0100
@@ -524,12 +524,6 @@ static unsigned int d945gtp5_pin_configs
0x02a19320, 0x40000100,
};
-static unsigned int macbook_pin_configs[10] = {
- 0x0321e230, 0x03a1e020, 0x400000fd, 0x9017e110,
- 0x400000fe, 0x0381e021, 0x1345e240, 0x13c5e22e,
- 0x400000fc, 0x400000fb,
-};
-
static unsigned int macbook_pro_v1_pin_configs[10] = {
0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
@@ -546,8 +540,8 @@ static unsigned int *stac922x_brd_tbl[ST
[STAC_D945_REF] = ref922x_pin_configs,
[STAC_D945GTP3] = d945gtp3_pin_configs,
[STAC_D945GTP5] = d945gtp5_pin_configs,
- [STAC_MACMINI] = d945gtp5_pin_configs,
- [STAC_MACBOOK] = macbook_pin_configs,
+ [STAC_MACMINI] = macbook_pro_v1_pin_configs,
+ [STAC_MACBOOK] = macbook_pro_v1_pin_configs,
[STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
[STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
};
|
|
From: Nicolas B. <ni...@bo...> - 2007-03-17 05:59:42
|
Hi, Takashi Iwai wrote: > At Fri, 16 Mar 2007 17:50:33 +0800, > Nicolas Boichat wrote: >> Hi, >> >> I just got this input from a Macmini user (subsys id: 0x106b0800), after >> asking him to try different pins settings. (the sound doesn't work >> properly with a vanilla 2.6.21-rc3 kernel) >> >> Tino Keitel wrote: >>> On Thu, Mar 15, 2007 at 18:12:30 +0800, Nicolas Boichat wrote: >>> >>> [...] >>> >>> >>>> Considered it worked with the mactel patches, you should try >>>> STAC_MACBOOK_PRO_V1 first.... >>>> >>> You are right, with STAC_MACBOOK_PRO_V1 I can use all required >>> features. Here are the results: >>> >>> - analog line in works, if "Line In as Output" is muted >>> >>> - analog line out works, it is controlled by the "Front" channel in >>> alsamixer >>> >>> - digital line out works >>> >>> - the internal speaker works, it is controlled by the "Master" channel >>> in alsamixer >>> >>> - the internal speaker is silent if there is an analog plug in line out >>> >>> - the internal speker still works if a (optical) digital cable is >>> plugged in line out, I guess because the optical plastic cable >>> doesn't short circuit the line out plug >>> >>> Minor glitches: >>> >>> There is an input selector that has the options "Line", "Mic" and >>> "Front Mic". However, I think that only "Line" is really usable, as I >>> had so signal when I connected a Mic to line in and a "Front Mic" is >>> also not present in the mini. >>> >>> There is a "Mic as output" switch in alsamixer, but there is not "Mic" >>> jack. >>> >> Considering these pins have been used for a long time on mactel-linux, > > Grrr, someone should have informed us. I didn't know of this. Sorry... Was quite busy recently, and I'm trying to get all our patches upstream now... >> and that they are working fine with MacBook (1st generation at least), >> Macmini and Macbook Pro (1st generation only), I think the following >> patch is appropriate (please apply it after the patch sent yesterday). > > But the glitches above don't appear on your macbook-pro-v1, right? Yeah I have some glitches too... For "Input source" I have "Front Mic", "Mic" and "Line", while only "Mic" and "Line" are useful. I also have a Mic as Output which is not relevant (no Mic jack)... I'll try to have a look at this. Also, to get the Mic to work, even if the "Input Source" is set to Mic at boot time, I have to switch to Line or Front Mic and then back to Mic. > Then I suppose macmini requires slightly different pin configs for > inputs. As for now, I think it's OK to use macbook-pro-v1 pin configs > for macmini since it's much better. So, how about to just keep the > models and change the pin definitions to use the same table? I saw your patch. Thx. Best regards, Nicolas |
|
From: Tino K. <tin...@ti...> - 2007-03-15 08:26:37
|
On Thu, Mar 15, 2007 at 13:45:28 +0800, Nicolas Boichat wrote: > # dmesg | grep hda_codec > > You should get something like this: > > [ 804.570794] hda_codec: STAC922x, Apple subsys_id=106b0200 So such line in my kernel logs. But I found it in /proc/asound/card0/codec#0: Codec: SigmaTel STAC9221 A1 Address: 0 Vendor Id: 0x83847680 Subsystem Id: 0x106b0800 Revision Id: 0x103401 Regards, Tino |
|
From: Tino K. <tin...@ti...> - 2007-03-15 08:36:46
|
On Thu, Mar 15, 2007 at 09:26:33 +0100, Tino Keitel wrote: > On Thu, Mar 15, 2007 at 13:45:28 +0800, Nicolas Boichat wrote: > > # dmesg | grep hda_codec > > > > You should get something like this: > > > > [ 804.570794] hda_codec: STAC922x, Apple subsys_id=106b0200 > > So such line in my kernel logs. But I found it in Oops, all my kernel logs are from 2.6.20. Regards, Tino |