Revision: 97
http://svn.sourceforge.net/mactel-linux/?rev=97&view=rev
Author: nboichat
Date: 2007-04-02 21:34:45 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Update 2.6.21 patchset.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch
trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
Removed Paths:
-------------
trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
Modified: trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch 2007-04-03
04:33:05 UTC (rev 96)
+++ trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch 2007-04-03
04:34:45 UTC (rev 97)
@@ -12,7 +12,7 @@
4 files changed, 948 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 81bcc22..cbfdc3e 100644
+index 8c8090e..57a2d44 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -367,6 +367,12 @@ L: linux-laptop@vger.kernel.org
Modified: trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch 2007-04-03
04:33:05 UTC (rev 96)
+++ trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch 2007-04-03
04:34:45 UTC (rev 97)
@@ -55,7 +55,7 @@
+register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as
+(sometimes) documented in processor datasheet.
diff --git a/MAINTAINERS b/MAINTAINERS
-index cbfdc3e..f74beef 100644
+index 57a2d44..28b4fbf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -958,6 +958,12 @@ M: [EMAIL PROTECTED]
Deleted: trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
2007-04-03 04:33:05 UTC (rev 96)
+++ trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
2007-04-03 04:34:45 UTC (rev 97)
@@ -1,92 +0,0 @@
-Fix audio on Macbook Pro.
-
-Need to be dropped when 2.6.21-rc5 is released (in 2.6.21-rc4-git*)
-
-From: Nicolas Boichat <[EMAIL PROTECTED]>
-
-
----
-
- Documentation/sound/alsa/ALSA-Configuration.txt | 3 ++-
- sound/pci/hda/patch_sigmatel.c | 25 +++++++++++++++++------
- 2 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt
b/Documentation/sound/alsa/ALSA-Configuration.txt
-index db398a6..438f3fe 100644
---- a/Documentation/sound/alsa/ALSA-Configuration.txt
-+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
-@@ -906,7 +906,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix.
This was removed.
- 5stack D945 5stack + SPDIF
- macmini Intel Mac Mini
- macbook Intel Mac Book
-- macbook-pro Intel Mac Book Pro
-+ macbook-pro-v1 Intel Mac Book Pro 1st generation
-+ macbook-pro Intel Mac Book Pro 2nd generation
-
- STAC9202/9250/9251
- ref Reference board, base config
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index 4c7b039..2d78a9f 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -60,7 +60,8 @@ enum {
- STAC_D945GTP5,
- STAC_MACMINI,
- STAC_MACBOOK,
-- STAC_MACBOOK_PRO,
-+ STAC_MACBOOK_PRO_V1,
-+ STAC_MACBOOK_PRO_V2,
- STAC_922X_MODELS
- };
-
-@@ -529,7 +530,13 @@ static unsigned int macbook_pin_configs[10] = {
- 0x400000fc, 0x400000fb,
- };
-
--static unsigned int macbook_pro_pin_configs[10] = {
-+static unsigned int macbook_pro_v1_pin_configs[10] = {
-+ 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
-+ 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
-+ 0x02a19320, 0x400000fb
-+};
-+
-+static unsigned int macbook_pro_v2_pin_configs[10] = {
- 0x0221401f, 0x90a70120, 0x01813024, 0x01014010,
- 0x400000fd, 0x01016011, 0x1345e240, 0x13c5e22e,
- 0x400000fc, 0x400000fb,
-@@ -541,7 +548,8 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
- [STAC_D945GTP5] = d945gtp5_pin_configs,
- [STAC_MACMINI] = d945gtp5_pin_configs,
- [STAC_MACBOOK] = macbook_pin_configs,
-- [STAC_MACBOOK_PRO] = macbook_pro_pin_configs,
-+ [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
-+ [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
- };
-
- static const char *stac922x_models[STAC_922X_MODELS] = {
-@@ -550,7 +558,8 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
- [STAC_D945GTP3] = "3stack",
- [STAC_MACMINI] = "macmini",
- [STAC_MACBOOK] = "macbook",
-- [STAC_MACBOOK_PRO] = "macbook-pro",
-+ [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1",
-+ [STAC_MACBOOK_PRO_V2] = "macbook-pro",
- };
-
- static struct snd_pci_quirk stac922x_cfg_tbl[] = {
-@@ -1889,9 +1898,13 @@ static int patch_stac922x(struct hda_codec *codec)
- /* 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 0x106b1e00:
-- spec->board_config = STAC_MACBOOK_PRO;
-+ 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;
- }
- }
Added: trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.21/0010-sigmatel_audio3.patch
2007-04-03 04:34:45 UTC (rev 97)
@@ -0,0 +1,22 @@
+Display all controls when the subsystem id is wrong (0x100).
+
+From: Nicolas Boichat <[EMAIL PROTECTED]>
+
+
+---
+
+ sound/pci/hda/patch_sigmatel.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index 4c5fee3..13cb0c5 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) {
++ case 0x100:
+ 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
