Revision: 42
http://svn.sourceforge.net/mactel-linux/?rev=42&view=rev
Author: nboichat
Date: 2006-09-19 06:58:18 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
Patches updates for 2.6.18-rc7.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.18/Changelog
trunk/kernel/mactel-patches-2.6.18/applesmc.patch
trunk/kernel/mactel-patches-2.6.18/version.patch
Removed Paths:
-------------
trunk/kernel/mactel-patches-2.6.18/efi_e820_all_mapped_fix.patch
Modified: trunk/kernel/mactel-patches-2.6.18/Changelog
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/Changelog 2006-08-17 02:11:17 UTC
(rev 41)
+++ trunk/kernel/mactel-patches-2.6.18/Changelog 2006-09-19 13:58:18 UTC
(rev 42)
@@ -1,5 +1,8 @@
Changes since 2.6.17:
+NOTE: applesmc now implements a LED class to control keyboard backlight,
+so you need to enable CONFIG_NEW_LEDS and CONFIG_LEDS_CLASS in your kernel
config.
+
Unchanged:
acpi-blacklist-fix.patch
ir.patch
@@ -8,7 +11,6 @@
Updated:
applesmc.patch: offsets
-efi_e820_all_mapped_fix.patch: offsets
mouseemu.patch: offsets + removed useless hunk for x86
piix.ich7.patch: offsets
sigmatel_audio.patch: various fixes
@@ -26,6 +28,7 @@
acpi-smart-battery.patch: included in vanilla (not absolutely sure)
intel_mac_sata_resume_fix.patch: major changes in vanilla kernel, maybe is it
not needed anymore
sata_resume.patch: same as intel_mac_sata_resume_fix.patch
+efi_e820_all_mapped_fix.patch: major changes in vanilla kernel, maybe is it
not needed anymore
To be updated:
config-2.6.18
Modified: trunk/kernel/mactel-patches-2.6.18/applesmc.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/applesmc.patch 2006-08-17 02:11:17 UTC
(rev 41)
+++ trunk/kernel/mactel-patches-2.6.18/applesmc.patch 2006-09-19 13:58:18 UTC
(rev 42)
@@ -1,6 +1,6 @@
diff -pruN linux/drivers/hwmon.vanilla/Kconfig linux/drivers/hwmon/Kconfig
---- linux/drivers/hwmon.vanilla/Kconfig 2006-07-07 14:50:32.000000000
+0200
-+++ linux/drivers/hwmon/Kconfig 2006-07-11 11:34:20.000000000 +0200
+--- linux/drivers/hwmon.vanilla/Kconfig 2006-08-30 21:46:09.000000000
+0800
++++ linux/drivers/hwmon/Kconfig 2006-09-01 12:14:58.000000000 +0800
@@ -507,6 +507,26 @@ config SENSORS_HDAPS
Say Y here if you have an applicable laptop and want to experience
the awesome power of hdaps.
@@ -29,8 +29,8 @@
bool "Hardware Monitoring Chip debugging messages"
depends on HWMON
diff -pruN linux/drivers/hwmon.vanilla/Makefile linux/drivers/hwmon/Makefile
---- linux/drivers/hwmon.vanilla/Makefile 2006-07-07 14:50:32.000000000
+0200
-+++ linux/drivers/hwmon/Makefile 2006-07-10 17:37:16.000000000 +0200
+--- linux/drivers/hwmon.vanilla/Makefile 2006-08-30 21:46:09.000000000
+0800
++++ linux/drivers/hwmon/Makefile 2006-09-01 12:14:58.000000000 +0800
@@ -18,6 +18,7 @@ obj-$(CONFIG_SENSORS_ADM1025) += adm1025
obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o
obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o
@@ -40,9 +40,9 @@
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
diff -pruN linux/drivers/hwmon.vanilla/applesmc.c
linux/drivers/hwmon/applesmc.c
---- linux/drivers/hwmon.vanilla/applesmc.c 1970-01-01 01:00:00.000000000
+0100
-+++ linux/drivers/hwmon/applesmc.c 2006-07-13 23:08:17.000000000 +0200
-@@ -0,0 +1,572 @@
+--- linux/drivers/hwmon.vanilla/applesmc.c 1970-01-01 07:30:00.000000000
+0730
++++ linux/drivers/hwmon/applesmc.c 2006-09-01 12:31:24.000000000 +0800
+@@ -0,0 +1,600 @@
+/*
+ * drivers/hwmon/applesmc.c - driver for Apple's SMC (various sensors)
+ *
@@ -74,6 +74,7 @@
+#include <linux/timer.h>
+#include <linux/dmi.h>
+#include <asm/io.h>
++#include <linux/leds.h>
+
+/* data port used by apple SMC */
+#define APPLESMC_DATA_PORT 0x300
@@ -443,6 +444,24 @@
+ return count;
+}
+
++static void applesmc_backlight_set(struct led_classdev *led_cdev,
++ enum led_brightness value)
++{
++ u8 buffer[2];
++
++ down(&applesmc_sem);
++ buffer[0] = value;
++ buffer[1] = 0x00;
++ applesmc_write_key(BACKLIGHT_KEY, buffer, 2);
++ up(&applesmc_sem);
++}
++
++static struct led_classdev applesmc_backlight = {
++ .name = "smc:kbd_backlight",
++ .default_trigger = "nand-disk",
++ .brightness_set = applesmc_backlight_set,
++};
++
+static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL);
+static DEVICE_ATTR(light, 0444, applesmc_light_show, NULL);
+static DEVICE_ATTR(keyboard_backlight, 0220, NULL,
applesmc_keyboard_backlight_store);
@@ -577,9 +596,17 @@
+ applesmc_timer.expires = jiffies + APPLESMC_POLL_PERIOD;
+ add_timer(&applesmc_timer);
+
++ /* register as a led device */
++ ret = led_classdev_register(&pdev->dev, &applesmc_backlight);
++ if (ret < 0)
++ goto out_input_device;
++
+ printk(KERN_INFO "applesmc: driver successfully loaded.\n");
+ return 0;
+
++out_input_device:
++ del_timer_sync(&applesmc_timer);
++ input_unregister_device(applesmc_idev);
+out_group:
+ sysfs_remove_group(&pdev->dev.kobj, &applesmc_attribute_group);
+out_device:
@@ -595,6 +622,7 @@
+
+static void __exit applesmc_exit(void)
+{
++ led_classdev_unregister(&applesmc_backlight);
+ del_timer_sync(&applesmc_timer);
+ input_unregister_device(applesmc_idev);
+ if (applesmc_light)
Deleted: trunk/kernel/mactel-patches-2.6.18/efi_e820_all_mapped_fix.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/efi_e820_all_mapped_fix.patch
2006-08-17 02:11:17 UTC (rev 41)
+++ trunk/kernel/mactel-patches-2.6.18/efi_e820_all_mapped_fix.patch
2006-09-19 13:58:18 UTC (rev 42)
@@ -1,48 +0,0 @@
---- a/arch/i386/kernel/setup.c 2006-06-19 09:12:09.000000000 +0200
-+++ b/arch/i386/kernel/setup.c 2006-06-19 09:12:24.000000000 +0200
-@@ -968,24 +968,28 @@
- u64 start = s;
- u64 end = e;
- int i;
-- for (i = 0; i < e820.nr_map; i++) {
-- struct e820entry *ei = &e820.map[i];
-- if (type && ei->type != type)
-- continue;
-- /* is the region (part) in overlap with the current region ?*/
-- if (ei->addr >= end || ei->addr + ei->size <= start)
-- continue;
-- /* if the region is at the beginning of <start,end> we move
-- * start to the end of the region since it's ok until there
-- */
-- if (ei->addr <= start)
-- start = ei->addr + ei->size;
-- /* if start is now at or beyond end, we're done, full
-- * coverage */
-- if (start >= end)
-- return 1; /* we're done */
-+ if(!efi_enabled) {
-+ for (i = 0; i < e820.nr_map; i++) {
-+ struct e820entry *ei = &e820.map[i];
-+ if (type && ei->type != type)
-+ continue;
-+ /* is the region (part) in overlap with the current
region ?*/
-+ if (ei->addr >= end || ei->addr + ei->size <= start)
-+ continue;
-+ /* if the region is at the beginning of <start,end> we
move
-+ * start to the end of the region since it's ok until
there
-+ */
-+ if (ei->addr <= start)
-+ start = ei->addr + ei->size;
-+ /* if start is now at or beyond end, we're done, full
-+ * coverage */
-+ if (start >= end)
-+ return 1; /* we're done */
-+ }
-+ return 0;
-+ } else {
-+ return 1;
- }
-- return 0;
- }
-
- /*
Modified: trunk/kernel/mactel-patches-2.6.18/version.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/version.patch 2006-08-17 02:11:17 UTC
(rev 41)
+++ trunk/kernel/mactel-patches-2.6.18/version.patch 2006-09-19 13:58:18 UTC
(rev 42)
@@ -4,8 +4,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 18
--EXTRAVERSION = -rc4
-+EXTRAVERSION = -rc4-mactel
+-EXTRAVERSION = -rc7
++EXTRAVERSION = -rc7-mactel
NAME=Crazed Snow-Weasel
# *DOCUMENTATION*
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
