Revision: 87
http://svn.sourceforge.net/mactel-linux/?rev=87&view=rev
Author: nboichat
Date: 2007-03-14 23:18:32 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
Remove usb-storage-zerowait.
Update sigmatel-audio (modifications asked by upstream maintainer)
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
Removed Paths:
-------------
trunk/kernel/mactel-patches-2.6.21/0003-usb-storage-zerowait.patch
Deleted: trunk/kernel/mactel-patches-2.6.21/0003-usb-storage-zerowait.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0003-usb-storage-zerowait.patch
2007-03-14 18:16:40 UTC (rev 86)
+++ trunk/kernel/mactel-patches-2.6.21/0003-usb-storage-zerowait.patch
2007-03-15 06:18:32 UTC (rev 87)
@@ -1,23 +0,0 @@
-Zero-wait on usb-storage.
-
-From: ? <?>
-
-
----
-
- drivers/usb/storage/usb.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
-index 8e898e3..6e33e13 100644
---- a/drivers/usb/storage/usb.c
-+++ b/drivers/usb/storage/usb.c
-@@ -107,7 +107,7 @@ MODULE_AUTHOR("Matthew Dharm <[EMAIL PROTECTED]>");
- MODULE_DESCRIPTION("USB Mass Storage driver for Linux");
- MODULE_LICENSE("GPL");
-
--static unsigned int delay_use = 5;
-+static unsigned int delay_use = 0;
- module_param(delay_use, uint, S_IRUGO | S_IWUSR);
- MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
-
Modified: trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
2007-03-14 18:16:40 UTC (rev 86)
+++ trunk/kernel/mactel-patches-2.6.21/0006-sigmatel_audio.patch
2007-03-15 06:18:32 UTC (rev 87)
@@ -5,11 +5,26 @@
---
- sound/pci/hda/patch_sigmatel.c | 21 +++++++++++++++++----
- 1 files changed, 17 insertions(+), 4 deletions(-)
+ 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..5ee9a82 100644
+index 4c7b039..2d78a9f 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -60,7 +60,8 @@ enum {
@@ -22,26 +37,28 @@
STAC_922X_MODELS
};
-@@ -529,6 +530,12 @@ static unsigned int macbook_pin_configs[10] = {
+@@ -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,
++ 0x0321e230, 0x03a1e020, 0x9017e110, 0x01014010,
++ 0x01a19021, 0x0381e021, 0x1345e240, 0x13c5e22e,
++ 0x02a19320, 0x400000fb
+};
+
- static unsigned int macbook_pro_pin_configs[10] = {
++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_pin_configs,
++ [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
};
static const char *stac922x_models[STAC_922X_MODELS] = {
@@ -51,7 +68,7 @@
[STAC_MACBOOK] = "macbook",
- [STAC_MACBOOK_PRO] = "macbook-pro",
+ [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1",
-+ [STAC_MACBOOK_PRO_V2] = "macbook-pro-v2",
++ [STAC_MACBOOK_PRO_V2] = "macbook-pro",
};
static struct snd_pci_quirk stac922x_cfg_tbl[] = {
@@ -61,11 +78,12 @@
*/
+ 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:
-- spec->board_config = STAC_MACBOOK_PRO;
++ case 0x106b1e00: /* MacBook Pro second generation */
+ spec->board_config = STAC_MACBOOK_PRO_V2;
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
