Re: [Mactel-linux-devel] [Alsa-devel] Macmini pins in sigmatel_audio

[Takashi I. <ti...@su...>]

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,
 };