Revision: 136
http://svn.sourceforge.net/mactel-linux/?rev=136&view=rev
Author: nboichat
Date: 2007-07-21 08:19:54 -0700 (Sat, 21 Jul 2007)
Log Message:
-----------
Rename audio patches and add support for Macbook v2.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.22/series
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macbook_v2.patch
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macmini_macbook.patch
Removed Paths:
-------------
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch
Modified: trunk/kernel/mactel-patches-2.6.22/series
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/series 2007-07-17 18:50:21 UTC (rev
135)
+++ trunk/kernel/mactel-patches-2.6.22/series 2007-07-21 15:19:54 UTC (rev
136)
@@ -1,8 +1,9 @@
# This series applies on GIT commit f44bba1a92e01bbab6ca9817b86ddf9e1744a616
applesmc-use-input-polldev.patch
applesmc-add-macbook-temperature-keys.patch
-sigmatel_audio2.patch
-sigmatel_audio3.patch
+sigmatel_audio_fix_macmini_macbook.patch
+sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
+sigmatel_audio_fix_macbook_v2.patch
applesmc_int.patch
appletouch.patch
appleir-undo-hid-blacklist.patch
Deleted: trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch 2007-07-17
18:50:21 UTC (rev 135)
+++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch 2007-07-21
15:19:54 UTC (rev 136)
@@ -1,51 +0,0 @@
-Fix audio on Macmini and Macbook.
-
-From: Takashi Iwai <[EMAIL PROTECTED]>
-
-
----
-
- sound/pci/hda/patch_sigmatel.c | 18 +++++++++++++++---
- 1 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index e3964fc..686a15a 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -549,12 +549,24 @@ static unsigned int d945gtp5_pin_configs[10] = {
- 0x02a19320, 0x40000100,
- };
-
--static unsigned int macbook_pro_v1_pin_configs[10] = {
-+static unsigned int macmini_pin_configs[10] = {
-+ 0x0321e230, 0x400000fd, 0x9017e110, 0x01014010,
-+ 0x400000fd, 0x0381e021, 0x1345e240, 0x13c5e22e,
-+ 0x400000fc, 0x400000fb
-+};
-+
-+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] = {
- 0x0221401f, 0x90a70120, 0x01813024, 0x01014010,
- 0x400000fd, 0x01016011, 0x1345e240, 0x13c5e22e,
-@@ -571,8 +583,8 @@ 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] = macbook_pro_v1_pin_configs,
-- [STAC_MACBOOK] = macbook_pro_v1_pin_configs,
-+ [STAC_MACMINI] = macmini_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,
- [STAC_IMAC_INTEL] = imac_intel_pin_configs,
Deleted: trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch 2007-07-17
18:50:21 UTC (rev 135)
+++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch 2007-07-21
15:19:54 UTC (rev 136)
@@ -1,22 +0,0 @@
-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 686a15a..89ee79b 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -2040,6 +2040,7 @@ static int patch_stac922x(struct hda_codec *codec)
- case 0x106b0a00: /* MacBook First generatoin */
- spec->board_config = STAC_MACBOOK;
- break;
-+ case 0x100: /* Invalid subsystem ID */
- case 0x106b0200: /* MacBook Pro first generation */
- spec->board_config = STAC_MACBOOK_PRO_V1;
- break;
Copied:
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
(from rev 133, trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch)
===================================================================
---
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
(rev 0)
+++
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch
2007-07-21 15:19:54 UTC (rev 136)
@@ -0,0 +1,24 @@
+Display Macbook Pro 1st gen controls when the subsystem id is wrong (0x100).
+
+From: Nicolas Boichat <[EMAIL PROTECTED]>
+
+
+---
+
+ sound/pci/hda/patch_sigmatel.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index 686a15a..fb55df0 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -2040,6 +2040,9 @@ static int patch_stac922x(struct hda_codec *codec)
+ case 0x106b0a00: /* MacBook First generatoin */
+ spec->board_config = STAC_MACBOOK;
+ break;
++ case 0x100: /* Invalid subsystem ID, happens randomly on
++ * MacBook Pro 1st generation
++ */
+ case 0x106b0200: /* MacBook Pro first generation */
+ spec->board_config = STAC_MACBOOK_PRO_V1;
+ break;
Added: trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macbook_v2.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macbook_v2.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macbook_v2.patch
2007-07-21 15:19:54 UTC (rev 136)
@@ -0,0 +1,74 @@
+Fixes audio on Macbook v2.
+
+From: Marek Sterzik <[EMAIL PROTECTED]>
+
+
+---
+
+ Documentation/sound/alsa/ALSA-Configuration.txt | 1 +
+ sound/pci/hda/patch_sigmatel.c | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt
b/Documentation/sound/alsa/ALSA-Configuration.txt
+index 355ff0a..7e3255d 100644
+--- a/Documentation/sound/alsa/ALSA-Configuration.txt
++++ b/Documentation/sound/alsa/ALSA-Configuration.txt
+@@ -909,6 +909,7 @@ 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-v2 Intel Mac Book 2nd generation
+ macbook-pro-v1 Intel Mac Book Pro 1st generation
+ macbook-pro Intel Mac Book Pro 2nd generation
+ imac-intel Intel iMac
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index fb55df0..2b598be 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -61,6 +61,7 @@ enum {
+ STAC_D945GTP5,
+ STAC_MACMINI,
+ STAC_MACBOOK,
++ STAC_MACBOOK_V2,
+ STAC_MACBOOK_PRO_V1,
+ STAC_MACBOOK_PRO_V2,
+ STAC_IMAC_INTEL,
+@@ -561,6 +562,12 @@ static unsigned int macbook_pin_configs[10] = {
+ 0x02a19320, 0x400000fb
+ };
+
++static unsigned int macbook_v2_pin_configs[10] = {
++ 0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,
++ 0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,
++ 0x400000fc, 0x400000fb
++};
++
+ static unsigned int macbook_pro_v1_pin_configs[10] = {
+ 0x0321e230, 0x02a7e020, 0x9017e110, 0x01014010,
+ 0x400000fd, 0x0381e021, 0x1345e240, 0x13c5e22e,
+@@ -585,6 +592,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
+ [STAC_D945GTP5] = d945gtp5_pin_configs,
+ [STAC_MACMINI] = macmini_pin_configs,
+ [STAC_MACBOOK] = macbook_pin_configs,
++ [STAC_MACBOOK_V2] = macbook_v2_pin_configs,
+ [STAC_MACBOOK_PRO_V1] = macbook_pro_v1_pin_configs,
+ [STAC_MACBOOK_PRO_V2] = macbook_pro_v2_pin_configs,
+ [STAC_IMAC_INTEL] = imac_intel_pin_configs,
+@@ -596,6 +604,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
+ [STAC_D945GTP3] = "3stack",
+ [STAC_MACMINI] = "macmini",
+ [STAC_MACBOOK] = "macbook",
++ [STAC_MACBOOK_V2] = "macbook-v2",
+ [STAC_MACBOOK_PRO_V1] = "macbook-pro-v1",
+ [STAC_MACBOOK_PRO_V2] = "macbook-pro",
+ [STAC_IMAC_INTEL] = "imac-intel",
+@@ -2040,6 +2049,9 @@ static int patch_stac922x(struct hda_codec *codec)
+ case 0x106b0a00: /* MacBook First generatoin */
+ spec->board_config = STAC_MACBOOK;
+ break;
++ case 0x106b2200: /* MacBook second generation */
++ spec->board_config = STAC_MACBOOK_V2;
++ break;
+ case 0x100: /* Invalid subsystem ID, happens randomly on
+ * MacBook Pro 1st generation
+ */
Copied:
trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macmini_macbook.patch
(from rev 133, trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch)
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macmini_macbook.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio_fix_macmini_macbook.patch
2007-07-21 15:19:54 UTC (rev 136)
@@ -0,0 +1,51 @@
+Fix audio on Macmini and Macbook.
+
+From: Takashi Iwai <[EMAIL PROTECTED]>
+
+
+---
+
+ sound/pci/hda/patch_sigmatel.c | 18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index e3964fc..686a15a 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -549,12 +549,24 @@ static unsigned int d945gtp5_pin_configs[10] = {
+ 0x02a19320, 0x40000100,
+ };
+
+-static unsigned int macbook_pro_v1_pin_configs[10] = {
++static unsigned int macmini_pin_configs[10] = {
++ 0x0321e230, 0x400000fd, 0x9017e110, 0x01014010,
++ 0x400000fd, 0x0381e021, 0x1345e240, 0x13c5e22e,
++ 0x400000fc, 0x400000fb
++};
++
++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] = {
+ 0x0221401f, 0x90a70120, 0x01813024, 0x01014010,
+ 0x400000fd, 0x01016011, 0x1345e240, 0x13c5e22e,
+@@ -571,8 +583,8 @@ 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] = macbook_pro_v1_pin_configs,
+- [STAC_MACBOOK] = macbook_pro_v1_pin_configs,
++ [STAC_MACMINI] = macmini_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,
+ [STAC_IMAC_INTEL] = imac_intel_pin_configs,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mactel-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
