Revision: 88
http://svn.sourceforge.net/mactel-linux/?rev=88&view=rev
Author: nboichat
Date: 2007-03-17 11:41:11 -0700 (Sat, 17 Mar 2007)
Log Message:
-----------
Fix sound on Macbook and Macmini.
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/0007-sigmatel_audio2.patch
Modified: trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch 2007-03-15
06:18:32 UTC (rev 87)
+++ trunk/kernel/mactel-patches-2.6.21/0001-applesmc.patch 2007-03-17
18:41:11 UTC (rev 88)
@@ -11,10 +11,10 @@
3 files changed, 989 insertions(+), 0 deletions(-)
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index c3d4856..798b91d 100644
+index 6d105a1..25b72a4 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
-@@ -593,6 +593,30 @@ config SENSORS_HDAPS
+@@ -594,6 +594,30 @@ config SENSORS_HDAPS
Say Y here if you have an applicable laptop and want to experience
the awesome power of hdaps.
Modified: trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch 2007-03-15
06:18:32 UTC (rev 87)
+++ trunk/kernel/mactel-patches-2.6.21/0004-coretemp.patch 2007-03-17
18:41:11 UTC (rev 88)
@@ -5,14 +5,58 @@
---
- arch/i386/kernel/msr.c | 31 ++--
- drivers/hwmon/Kconfig | 9 +
- drivers/hwmon/Makefile | 1
- drivers/hwmon/coretemp.c | 400 ++++++++++++++++++++++++++++++++++++++++++++++
- include/asm-i386/msr.h | 3
- include/asm-x86_64/msr.h | 3
- 6 files changed, 433 insertions(+), 14 deletions(-)
+ Documentation/hwmon/coretemp | 37 ++++
+ arch/i386/kernel/msr.c | 31 ++-
+ drivers/hwmon/Kconfig | 9 +
+ drivers/hwmon/Makefile | 1
+ drivers/hwmon/coretemp.c | 400 ++++++++++++++++++++++++++++++++++++++++++
+ include/asm-i386/msr.h | 3
+ include/asm-x86_64/msr.h | 3
+ 7 files changed, 470 insertions(+), 14 deletions(-)
+diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
+new file mode 100644
+index 0000000..ba02dee
+--- /dev/null
++++ b/Documentation/hwmon/coretemp
+@@ -0,0 +1,37 @@
++Kernel driver coretemp
++======================
++
++Supported chips:
++ * All Intel Core family
++ Prefix: 'coretemp'
++ Addresses scanned: CPUID (family 0x6, models 0xe, 0xf)
++ Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
++ Volume 3A: System Programming Guide
++
++Author: Rudolf Marek
++Contact: Rudolf Marek <[EMAIL PROTECTED]>
++
++Description
++-----------
++
++This driver permits reading temperature sensor embedded inside Intel Core CPU.
++Temperature is measured in degrees Celsius and measurement resolution is
++1 degree C. Valid temperatures are from 0 to TjMax degrees C, because
++the actual temperature is in fact a delta from TjMax.
++
++Temperature known as TjMax is the maximum junction temperature of processor.
++Intel defines this temperature as 85C or 100C. At this temperature, protection
++mechanism will perform actions to forcibly cool down the processor. Alarm
++may be raised, if the temperature grows enough (more than TjMax) to trigger
++the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
++
++temp1_input - Core temperature (in milidegrees of Celsius).
++temp1_crit - Maximum junction temperature (in milidegrees of Celsius).
++temp1_crit_alarm - Set when Out-of-spec bit is set, never clears.
++ Correct CPU operation is no longer guaranteed.
++temp1_label - Contains string with the "Core X", where X is processor
++ number.
++
++The TjMax temperature is set to 85C if undocumented model specific register
++(UMSR) 0xee has bit 30 set. If not the TjMax is 100C as documented in
processor
++datasheet. Intel will not disclose this information to individuals.
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index bcaa6e9..c9a8f88 100644
--- a/arch/i386/kernel/msr.c
@@ -122,7 +166,7 @@
static int msr_device_create(int i)
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index 798b91d..5278f1d 100644
+index 25b72a4..873e463 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -167,6 +167,15 @@ config SENSORS_ATXP1
Added: trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.21/0007-sigmatel_audio2.patch
2007-03-17 18:41:11 UTC (rev 88)
@@ -0,0 +1,38 @@
+Fix audio on Macmini and Macbook.
+
+From: Takashi Iwai <[EMAIL PROTECTED]>
+
+
+---
+
+ sound/pci/hda/patch_sigmatel.c | 10 ++--------
+ 1 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index 2d78a9f..9ff5cf2 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -524,12 +524,6 @@ static unsigned int d945gtp5_pin_configs[10] = {
+ 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[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] = 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,
+ };
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
