Revision: 111
http://svn.sourceforge.net/mactel-linux/?rev=111&view=rev
Author: nboichat
Date: 2007-04-11 00:48:53 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
Hopefully fix audio on Macbook... (reverted to old pins)
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
Modified: trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
2007-04-10 22:48:54 UTC (rev 110)
+++ trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
2007-04-11 07:48:53 UTC (rev 111)
@@ -5,14 +5,14 @@
---
- sound/pci/hda/patch_sigmatel.c | 19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
+ sound/pci/hda/patch_sigmatel.c | 21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index c94291b..07bfc6e 100644
+index c94291b..af46702 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -524,16 +524,16 @@ static unsigned int d945gtp5_pin_configs[10] = {
+@@ -524,16 +524,22 @@ static unsigned int d945gtp5_pin_configs[10] = {
0x02a19320, 0x40000100,
};
@@ -26,32 +26,36 @@
+ 0x400000fc, 0x400000fb
};
- static unsigned int macbook_pro_v1_pin_configs[10] = {
-- 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
-- 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
-- 0x02a19320, 0x400000fb
+-static unsigned int macbook_pro_v1_pin_configs[10] = {
++static unsigned int macbook_pin_configs[10] = {
+ 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
+ 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
+ 0x02a19320, 0x400000fb
++}
++
++static unsigned int macbook_pro_v1_pin_configs[10] = {
+ 0x0321e230, 0x02a7e020, 0x9017e110, 0x01014010,
+ 0x400000fd, 0x0381e021, 0x1345e240, 0x13c5e22e,
+ 0x400000fc, 0x400000fb
};
static unsigned int macbook_pro_v2_pin_configs[10] = {
-@@ -546,8 +546,8 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
+@@ -546,7 +552,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_MACMINI] = macmini_pin_configs,
-+ [STAC_MACBOOK] = macbook_pro_v1_pin_configs,
+ [STAC_MACBOOK] = macbook_pin_configs,
[STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
[STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
- };
-@@ -1905,6 +1905,7 @@ static int patch_stac922x(struct hda_codec *codec)
+@@ -1905,6 +1911,9 @@ static int patch_stac922x(struct hda_codec *codec)
*/
printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n",
codec->subsystem_id);
switch (codec->subsystem_id) {
+ case 0x106b0a00: /* MacBook first generation */
++ spec->board_config = STAC_MACBOOK;
++ break;
case 0x106b0200: /* MacBook Pro first generation */
spec->board_config = STAC_MACBOOK_PRO_V1;
break;
Modified: trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
2007-04-10 22:48:54 UTC (rev 110)
+++ trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
2007-04-11 07:48:53 UTC (rev 111)
@@ -9,14 +9,14 @@
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index 07bfc6e..4f064c3 100644
+index af46702..89a7e19 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -1905,6 +1905,7 @@ static int patch_stac922x(struct hda_codec *codec)
- */
- printk(KERN_INFO "hda_codec: STAC922x, Apple subsys_id=%x\n",
codec->subsystem_id);
- switch (codec->subsystem_id) {
+@@ -1914,6 +1914,7 @@ static int patch_stac922x(struct hda_codec *codec)
+ case 0x106b0a00: /* MacBook first generation */
+ spec->board_config = STAC_MACBOOK;
+ break;
+ case 0x100: /* Invalid subsystem ID */
- case 0x106b0a00: /* MacBook first generation */
case 0x106b0200: /* MacBook Pro first generation */
spec->board_config = STAC_MACBOOK_PRO_V1;
+ break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mactel-linux-devel mailing list
Mactel-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
