diff options
Diffstat (limited to 'sys-kernel/mactel-linux-sources/files')
8 files changed, 0 insertions, 879 deletions
diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch deleted file mode 100644 index 860f9d4..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-case-led.patch +++ /dev/null @@ -1,142 +0,0 @@ -[PATCH] applesmc case led and SCSI LED activity trigger - -From: René Rebe <rene@exactcode.de> - - ---- - - drivers/hwmon/applesmc.c | 70 ++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 61 insertions(+), 9 deletions(-) - -diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index 86c66c3..377c96d 100644 ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -63,6 +63,8 @@ - - #define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */ - -+#define LED_KEY "LSLF" /* r-w ui16 */ -+ - #define MOTION_SENSOR_X_KEY "MO_X" /* r-o sp78 (2 bytes) */ - #define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o sp78 (2 bytes) */ - #define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o sp78 (2 bytes) */ -@@ -151,7 +153,7 @@ static DEFINE_MUTEX(applesmc_lock); - */ - static unsigned int key_at_index; - --static struct workqueue_struct *applesmc_led_wq; -+static struct workqueue_struct *applesmc_led_wq, *applesmc_backlight_wq; - - /* - * __wait_status - Wait up to 2ms for the status port to get a certain value -@@ -742,13 +744,40 @@ static void applesmc_backlight_set(struct work_struct *work) - } - static DECLARE_WORK(backlight_work, &applesmc_backlight_set); - --static void applesmc_brightness_set(struct led_classdev *led_cdev, -- enum led_brightness value) -+static void applesmc_backlight_brightness_set(struct led_classdev *led_cdev, -+ enum led_brightness value) - { - int ret; - - backlight_value = value; -- ret = queue_work(applesmc_led_wq, &backlight_work); -+ ret = queue_work(applesmc_backlight_wq, &backlight_work); -+ -+ if (debug && (!ret)) -+ printk(KERN_DEBUG "applesmc: work was already on the queue.\n"); -+} -+ -+/* Store the next LED value to be written by the work */ -+static unsigned int led_value; -+ -+static void applesmc_led_set(struct work_struct *work) -+{ -+ u8 buffer[2]; -+ -+ mutex_lock(&applesmc_lock); -+ buffer[0] = led_value; -+ buffer[1] = 0x00; -+ applesmc_write_key(LED_KEY, buffer, 2); -+ mutex_unlock(&applesmc_lock); -+} -+static DECLARE_WORK(led_work, &applesmc_led_set); -+ -+static void applesmc_led_brightness_set(struct led_classdev *led_cdev, -+ enum led_brightness value) -+{ -+ int ret; -+ -+ led_value = value; -+ ret = queue_work(applesmc_led_wq, &led_work); - - if (debug && (!ret)) - printk(KERN_DEBUG "applesmc: work was already on the queue.\n"); -@@ -904,10 +933,16 @@ static ssize_t applesmc_key_at_index_store(struct device *dev, - return count; - } - -+static struct led_classdev applesmc_led = { -+ .name = "smc:case-led", -+ .default_trigger = "ide-disk", -+ .brightness_set = applesmc_led_brightness_set, -+}; -+ - static struct led_classdev applesmc_backlight = { - .name = "smc:kbd_backlight", - .default_trigger = "nand-disk", -- .brightness_set = applesmc_brightness_set, -+ .brightness_set = applesmc_backlight_brightness_set, - }; - - static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL); -@@ -1340,15 +1375,28 @@ static int __init applesmc_init(void) - goto out_temperature; - } - -+ /* Create the workqueue */ -+ applesmc_led_wq = create_singlethread_workqueue("applesmc-led"); -+ if (!applesmc_led_wq) { -+ ret = -ENOMEM; -+ goto out_accelerometer; -+ } -+ -+ /* register as a led device */ -+ ret = led_classdev_register(&pdev->dev, &applesmc_led); -+ if (ret < 0) -+ goto out_led_wq; -+ -+ - if (applesmc_light) { - /* Add light sensor file */ - ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_light.attr); - if (ret) -- goto out_accelerometer; -+ goto out_led_ledclass; - - /* Create the workqueue */ -- applesmc_led_wq = create_singlethread_workqueue("applesmc-led"); -- if (!applesmc_led_wq) { -+ applesmc_backlight_wq = create_singlethread_workqueue("applesmc-backlight"); -+ if (!applesmc_backlight_wq) { - ret = -ENOMEM; - goto out_light_sysfs; - } -@@ -1374,10 +1422,14 @@ out_light_ledclass: - led_classdev_unregister(&applesmc_backlight); - out_light_wq: - if (applesmc_light) -- destroy_workqueue(applesmc_led_wq); -+ destroy_workqueue(applesmc_backlight_wq); - out_light_sysfs: - if (applesmc_light) - sysfs_remove_file(&pdev->dev.kobj, &dev_attr_light.attr); -+out_led_ledclass: -+ led_classdev_unregister(&applesmc_led); -+out_led_wq: -+ destroy_workqueue(applesmc_led_wq); - out_accelerometer: - if (applesmc_accelerometer) - applesmc_release_accelerometer(); diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch deleted file mode 100644 index 8f7e84e..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-macbook2.patch +++ /dev/null @@ -1,76 +0,0 @@ -Add sensors set for MacBook2, from register dump on a mid-2007 MacBook2. - -From: Riki Oktarianto <rkoktarianto@gmail.com> - - ---- - - drivers/hwmon/applesmc.c | 29 +++++++++++++++++++---------- - 1 files changed, 19 insertions(+), 10 deletions(-) - -diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index 377c96d..4dca4cd 100644 ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -86,12 +86,15 @@ static const char* temperature_sensors_sets[][36] = { - /* Set 0: Macbook Pro */ - { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H", - "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL }, --/* Set 1: Macbook set */ -+/* Set 1: Macbook2 set */ -+ { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "TTF0", "Th0H", -+ "Th0S", "Th1H", NULL }, -+/* Set 2: Macbook set */ - { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S", - "Th1H", "Ts0P", NULL }, --/* Set 2: Macmini set */ -+/* Set 3: Macmini set */ - { "TC0D", "TC0P", NULL }, --/* Set 3: Mac Pro (2 x Quad-Core) */ -+/* Set 4: Mac Pro (2 x Quad-Core) */ - { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P", - "TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "THTG", "TH0P", - "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", -@@ -1247,12 +1250,14 @@ static void applesmc_release_accelerometer(void) - static __initdata struct dmi_match_data applesmc_dmi_data[] = { - /* MacBook Pro: accelerometer, backlight and temperature set 0 */ - { .accelerometer = 1, .light = 1, .temperature_set = 0 }, --/* MacBook: accelerometer and temperature set 1 */ -+/* MacBook2: accelerometer and temperature set 1 */ - { .accelerometer = 1, .light = 0, .temperature_set = 1 }, --/* MacMini: temperature set 2 */ -- { .accelerometer = 0, .light = 0, .temperature_set = 2 }, --/* MacPro: temperature set 3 */ -+/* MacBook: accelerometer and temperature set 2 */ -+ { .accelerometer = 1, .light = 0, .temperature_set = 2 }, -+/* MacMini: temperature set 3 */ - { .accelerometer = 0, .light = 0, .temperature_set = 3 }, -+/* MacPro: temperature set 4 */ -+ { .accelerometer = 0, .light = 0, .temperature_set = 4 }, - }; - - /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1". -@@ -1264,16 +1269,20 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = { - (void*)&applesmc_dmi_data[0]}, - { applesmc_dmi_match, "Apple MacBook", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), -- DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, -+ DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") }, - (void*)&applesmc_dmi_data[1]}, -+ { applesmc_dmi_match, "Apple MacBook", { -+ DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), -+ DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") }, -+ (void*)&applesmc_dmi_data[2]}, - { applesmc_dmi_match, "Apple Macmini", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") }, -- (void*)&applesmc_dmi_data[2]}, -+ (void*)&applesmc_dmi_data[3]}, - { applesmc_dmi_match, "Apple MacPro2", { - DMI_MATCH(DMI_BOARD_VENDOR,"Apple"), - DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") }, -- (void*)&applesmc_dmi_data[3]}, -+ (void*)&applesmc_dmi_data[4]}, - { .ident = NULL } - }; - diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch deleted file mode 100644 index ad72674..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc-retry-when-accessing-keys.patch +++ /dev/null @@ -1,115 +0,0 @@ -Retry up to 200 ms when reading or writing keys. - -From: Nicolas Boichat <nicolas@boichat.ch> - - ---- - - drivers/hwmon/applesmc.c | 69 +++++++++++++++++++++++++++++++--------------- - 1 files changed, 47 insertions(+), 22 deletions(-) - -diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index 4dca4cd..0950839 100644 ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -114,6 +114,9 @@ static const char* fan_speed_keys[] = { - #define INIT_TIMEOUT_MSECS 5000 /* wait up to 5s for device init ... */ - #define INIT_WAIT_MSECS 50 /* ... in 50ms increments */ - -+#define ACCESS_TIMEOUT_MSECS 500 /* wait up to 500ms when accessing a key */ -+#define ACCESS_WAIT_MSECS 5 /* ... in 5ms increments */ -+ - #define APPLESMC_POLL_INTERVAL 50 /* msecs */ - #define APPLESMC_INPUT_FUZZ 4 /* input event threshold */ - #define APPLESMC_INPUT_FLAT 4 -@@ -188,12 +191,13 @@ static int __wait_status(u8 val) - - /* - * applesmc_read_key - reads len bytes from a given key, and put them in buffer. -+ * Tries up to ACCESS_WAIT_MSECS to read the value. - * Returns zero on success or a negative error on failure. Callers must - * hold applesmc_lock. - */ - static int applesmc_read_key(const char* key, u8* buffer, u8 len) - { -- int i; -+ int i, total, ret; - - if (len > APPLESMC_MAX_DATA_LENGTH) { - printk(KERN_ERR "applesmc_read_key: cannot read more than " -@@ -201,33 +205,54 @@ static int applesmc_read_key(const char* key, u8* buffer, u8 len) - return -EINVAL; - } - -- outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT); -- if (__wait_status(0x0c)) -- return -EIO; -+ for (total = ACCESS_TIMEOUT_MSECS; total > 0; -+ total -= ACCESS_WAIT_MSECS) { -+ ret = 0; -+ outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT); -+ if (__wait_status(0x0c)) { -+ ret = -EIO; -+ goto wait_fail; -+ } - -- for (i = 0; i < 4; i++) { -- outb(key[i], APPLESMC_DATA_PORT); -- if (__wait_status(0x04)) -- return -EIO; -- } -- if (debug) -- printk(KERN_DEBUG "<%s", key); -+ for (i = 0; i < 4; i++) { -+ outb(key[i], APPLESMC_DATA_PORT); -+ if (__wait_status(0x04)) { -+ ret = -EIO; -+ goto wait_fail; -+ } -+ } -+ if (debug) -+ printk(KERN_DEBUG "<%s", key); - -- outb(len, APPLESMC_DATA_PORT); -- if (debug) -- printk(KERN_DEBUG ">%x", len); -+ outb(len, APPLESMC_DATA_PORT); -+ if (debug) -+ printk(KERN_DEBUG ">%x", len); - -- for (i = 0; i < len; i++) { -- if (__wait_status(0x05)) -- return -EIO; -- buffer[i] = inb(APPLESMC_DATA_PORT); -+ for (i = 0; i < len; i++) { -+ if (__wait_status(0x05)) { -+ ret = -EIO; -+ goto wait_fail; -+ } -+ buffer[i] = inb(APPLESMC_DATA_PORT); -+ if (debug) -+ printk(KERN_DEBUG "<%x", buffer[i]); -+ } - if (debug) -- printk(KERN_DEBUG "<%x", buffer[i]); -+ printk(KERN_DEBUG "\n"); -+ -+ break; -+ -+wait_fail: -+ msleep(ACCESS_WAIT_MSECS); -+ continue; - } -- if (debug) -- printk(KERN_DEBUG "\n"); - -- return 0; -+ if (total != ACCESS_TIMEOUT_MSECS) { -+ printk(KERN_DEBUG "Read: Waited %d ms for the value\n", -+ ACCESS_TIMEOUT_MSECS-total); -+ } -+ -+ return ret; - } - - /* diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch deleted file mode 100644 index a0904f8..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/applesmc_int.patch +++ /dev/null @@ -1,415 +0,0 @@ -Add interrupt support for the accelerometer. A message is printed in dmesg when an interrupt occurs, but no further handling is done. - -From: Nicolas Boichat <nicolas@boichat.ch> - - ---- - - drivers/hwmon/applesmc.c | 321 +++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 298 insertions(+), 23 deletions(-) - -diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index 0950839..fe07ebd 100644 ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -39,14 +39,20 @@ - #include <linux/leds.h> - #include <linux/hwmon.h> - #include <linux/workqueue.h> -+#include <linux/interrupt.h> - - /* data port used by Apple SMC */ - #define APPLESMC_DATA_PORT 0x300 - /* command/status port used by Apple SMC */ - #define APPLESMC_CMD_PORT 0x304 -+/* status port used by Apple SMC to get which interrupt type just happened */ -+#define APPLESMC_INT_PORT 0x31f - - #define APPLESMC_NR_PORTS 32 /* 0x300-0x31f */ - -+/* Defined in ACPI DSDT table, should we read it from there? */ -+#define APPLESMC_IRQ 6 -+ - #define APPLESMC_MAX_DATA_LENGTH 32 - - #define APPLESMC_STATUS_MASK 0x0f -@@ -57,6 +63,8 @@ - - #define KEY_COUNT_KEY "#KEY" /* r-o ui32 */ - -+#define INTERRUPT_OK_KEY "NTOK" /* w-o ui8 */ -+ - #define LIGHT_SENSOR_LEFT_KEY "ALV0" /* r-o {alv (6 bytes) */ - #define LIGHT_SENSOR_RIGHT_KEY "ALV1" /* r-o {alv (6 bytes) */ - #define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */ -@@ -70,6 +78,19 @@ - #define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o sp78 (2 bytes) */ - #define MOTION_SENSOR_KEY "MOCN" /* r/w ui16 */ - -+/* -+ * Interrupt controls. -+ * If the norm of the position (sqrt(MO_X^2+MO_Y^2+MO_Z^2)) is smaller than -+ * MOLT (free fall), or bigger than MOHT (high acceleration) for longer than the -+ * value of MOLD (or MOHD), SMC will trigger an interrupt. -+ */ -+#define MOTION_LOW_NORM "MOLT" /* r/w sp78 (2 bytes) */ -+#define MOTION_HIGH_NORM "MOHT" /* r/w sp78 (2 bytes) */ -+#define MOTION_LOW_NORM_INTERVAL "MOLD" /* r/w ui8 */ -+#define MOTION_HIGH_NORM_INTERVAL "MOHD" /* r/w ui8 */ -+ -+#define MSDW_KEY "MSDW" /* r/w flag (1 byte) */ -+ - #define FANS_COUNT "FNum" /* r-o ui8 */ - #define FANS_MANUAL "FS! " /* r-w ui16 */ - #define FAN_ACTUAL_SPEED "F0Ac" /* r-o fpe2 (2 bytes) */ -@@ -387,12 +408,83 @@ static int applesmc_read_motion_sensor(int index, s16* value) - } - - /* -+ * applesmc_init_check_key_value - checks if a given key contains the bytes in -+ * buffer, if not, writes these bytes. -+ * In case of failure retry every INIT_WAIT_MSECS msec, and timeout if it -+ * waited more than INIT_TIMEOUT_MSECS in total. -+ * Returns zero on success or a negative error on failure. Callers must -+ * hold applesmc_lock. -+ */ -+static int applesmc_init_check_key_value(const char *key, u8 *buffer, u8 len) -+{ -+ int total, ret, i, compare; -+ u8 rdbuffer[APPLESMC_MAX_DATA_LENGTH]; -+ -+ if (len > APPLESMC_MAX_DATA_LENGTH) { -+ printk(KERN_ERR "applesmc_init_check_key_value: cannot " -+ "read/write more than %d bytes", -+ APPLESMC_MAX_DATA_LENGTH); -+ return -EINVAL; -+ } -+ -+ for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) { -+ ret = applesmc_read_key(key, rdbuffer, len); -+ if (!ret) { -+ compare = 1; -+ for (i = 0; i < len; i++) { -+ if (rdbuffer[i] != buffer[i]) { -+ compare = 0; -+ break; -+ } -+ } -+ -+ if (compare) { -+ return 0; -+ } -+ } -+ ret = applesmc_write_key(key, buffer, len); -+ msleep(INIT_WAIT_MSECS); -+ } -+ -+ if (ret) -+ return ret; -+ else -+ return -EIO; -+} -+ -+irqreturn_t applesmc_irq_handler(int irq, void *dev_id) -+{ -+ u8 int_type = inb(APPLESMC_INT_PORT); -+ -+ switch (int_type) { -+ case 0x60: -+ printk(KERN_INFO "applesmc: received a free fall interrupt\n"); -+ break; -+ case 0x6f: -+ printk(KERN_INFO -+ "applesmc: received a high acceleration interrupt\n"); -+ break; -+ case 0x80: -+ printk(KERN_INFO "applesmc: received a shock interrupt\n"); -+ break; -+ default: -+ printk(KERN_INFO -+ "applesmc: received an unknown interrupt %x\n", -+ int_type); -+ } -+ -+ return IRQ_HANDLED; -+} -+ -+/* - * applesmc_device_init - initialize the accelerometer. Returns zero on success - * and negative error code on failure. Can sleep. - */ - static int applesmc_device_init(void) - { -- int total, ret = -ENXIO; -+ int total; -+ int ret = -ENXIO; -+ int ret1, ret2; - u8 buffer[2]; - - if (!applesmc_accelerometer) -@@ -400,32 +492,79 @@ static int applesmc_device_init(void) - - mutex_lock(&applesmc_lock); - -+ /* Accept interrupts */ -+ buffer[0] = 0x01; - for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) { -- if (debug) -- printk(KERN_DEBUG "applesmc try %d\n", total); -- if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) && -- (buffer[0] != 0x00 || buffer[1] != 0x00)) { -- if (total == INIT_TIMEOUT_MSECS) { -- printk(KERN_DEBUG "applesmc: device has" -- " already been initialized" -- " (0x%02x, 0x%02x).\n", -- buffer[0], buffer[1]); -- } else { -- printk(KERN_DEBUG "applesmc: device" -- " successfully initialized" -- " (0x%02x, 0x%02x).\n", -- buffer[0], buffer[1]); -- } -- ret = 0; -- goto out; -- } -- buffer[0] = 0xe0; -- buffer[1] = 0x00; -- applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2); -+ ret1 = applesmc_write_key(INTERRUPT_OK_KEY, buffer, 1); - msleep(INIT_WAIT_MSECS); -+ -+ if (!ret1) -+ break; -+ } -+ if (ret1) -+ printk(KERN_WARNING "applesmc: Cannot set NTOK key, " -+ "will not receive interrupts.\n"); -+ -+ /* Setup interrupt controls. */ -+ buffer[0] = 20; /* 20 msecs */ -+ ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM_INTERVAL, -+ buffer, 1); -+ -+ buffer[0] = 20; /* 20 msecs */ -+ ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM_INTERVAL, -+ buffer, 1); -+ -+ if (ret1 || ret2) { -+ printk(KERN_WARNING "applesmc: Cannot set motion sensor " -+ "interrupt interval, might not receive " -+ "some interrupts."); - } - -- printk(KERN_WARNING "applesmc: failed to init the device\n"); -+ buffer[0] = 0x00; -+ buffer[1] = 0x60; -+ ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM, buffer, 2); -+ -+ buffer[0] = 0x01; -+ buffer[1] = 0xc0; -+ ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM, buffer, 2); -+ -+ if (ret1 || ret2) { -+ printk(KERN_WARNING "applesmc: Cannot set motion sensor " -+ "min/max norm parameters, " -+ "might not receive some interrupts."); -+ } -+ -+ /* Mysterious key. */ -+ buffer[0] = 0x01; -+ for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) { -+ ret1 = applesmc_write_key(MSDW_KEY, buffer, 1); -+ msleep(INIT_WAIT_MSECS); -+ -+ if (!ret1) -+ break; -+ } -+ if (ret1) -+ printk(KERN_WARNING "applesmc: Cannot set MSDW key\n"); -+ -+ /* Initialize the device. */ -+ buffer[0] = 0xe0; -+ buffer[1] = 0xf8; -+ if (applesmc_init_check_key_value(MOTION_SENSOR_KEY, buffer, 2)) { -+ printk(KERN_WARNING "applesmc: failed to init " -+ "the accelerometer\n"); -+ goto out; -+ } -+ -+ ret1 = request_irq(APPLESMC_IRQ, applesmc_irq_handler, IRQF_DISABLED, -+ "applesmc_irq_handler", NULL); -+ -+ if (ret1) { -+ printk(KERN_WARNING "applesmc: cannot setup irq handler\n"); -+ } -+ -+ printk(KERN_DEBUG "applesmc: accelerometer " -+ "successfully initialized.\n"); -+ ret = 0; - - out: - mutex_unlock(&applesmc_lock); -@@ -470,9 +609,16 @@ static int applesmc_resume(struct platform_device *dev) - return applesmc_device_init(); - } - -+static int applesmc_remove(struct platform_device *dev) -+{ -+ free_irq(APPLESMC_IRQ, NULL); -+ return 0; -+} -+ - static struct platform_driver applesmc_driver = { - .probe = applesmc_probe, - .resume = applesmc_resume, -+ .remove = applesmc_remove, - .driver = { - .name = "applesmc", - .owner = THIS_MODULE, -@@ -961,6 +1107,123 @@ static ssize_t applesmc_key_at_index_store(struct device *dev, - return count; - } - -+static ssize_t applesmc_accelerometer_show(struct device *dev, -+ struct device_attribute *attr, char *sysfsbuf) -+{ -+ int ret; -+ unsigned int value = 0; -+ u8 buffer[2]; -+ char *key; -+ int length; -+ struct sensor_device_attribute_2 *sensor_attr = -+ to_sensor_dev_attr_2(attr); -+ -+ switch (sensor_attr->index) { -+ case 0: -+ key = MOTION_LOW_NORM_INTERVAL; -+ length = 1; -+ break; -+ case 1: -+ key = MOTION_HIGH_NORM_INTERVAL; -+ length = 1; -+ break; -+ case 2: -+ key = MOTION_LOW_NORM; -+ length = 2; -+ break; -+ case 3: -+ key = MOTION_HIGH_NORM; -+ length = 2; -+ break; -+ default: -+ printk(KERN_ERR -+ "Invalid index for applesmc_accelerometer_show"); -+ return -EINVAL; -+ } -+ -+ mutex_lock(&applesmc_lock); -+ -+ ret = applesmc_read_key(key, buffer, length); -+ if (length == 2) -+ value = ((unsigned int)buffer[0] << 8) | buffer[1]; -+ else if (length == 1) -+ value = buffer[0]; -+ else { -+ printk("Invalid length for applesmc_param_show"); -+ ret = -EINVAL; -+ } -+ -+ mutex_unlock(&applesmc_lock); -+ if (ret) -+ return ret; -+ else -+ return snprintf(sysfsbuf, PAGE_SIZE, "%u\n", value); -+} -+ -+static ssize_t applesmc_accelerometer_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *sysfsbuf, size_t count) -+{ -+ int ret; -+ u32 value; -+ u8 buffer[2]; -+ char *key; -+ int length; -+ struct sensor_device_attribute_2 *sensor_attr = -+ to_sensor_dev_attr_2(attr); -+ -+ switch (sensor_attr->index) { -+ case 0: -+ key = MOTION_LOW_NORM_INTERVAL; -+ length = 1; -+ break; -+ case 1: -+ key = MOTION_HIGH_NORM_INTERVAL; -+ length = 1; -+ break; -+ case 2: -+ key = MOTION_LOW_NORM; -+ length = 2; -+ break; -+ case 3: -+ key = MOTION_HIGH_NORM; -+ length = 2; -+ break; -+ default: -+ printk("Invalid index for applesmc_accelerometer_show"); -+ return -EINVAL; -+ } -+ -+ value = simple_strtoul(sysfsbuf, NULL, 10); -+ -+ if (length == 2) { -+ if (value > 0xffff) -+ return -EINVAL; -+ -+ buffer[0] = (value >> 8) & 0xff; -+ buffer[1] = value & 0xff; -+ } else if (length == 1) { -+ if (value > 0xff) -+ return -EINVAL; -+ -+ buffer[0] = value & 0xff; -+ } else { -+ printk("Invalid length for applesmc_param_store"); -+ return -EINVAL; -+ } -+ -+ mutex_lock(&applesmc_lock); -+ -+ ret = applesmc_write_key(key, buffer, length); -+ -+ mutex_unlock(&applesmc_lock); -+ -+ if (ret) -+ return ret; -+ else -+ return count; -+} -+ - static struct led_classdev applesmc_led = { - .name = "smc:case-led", - .default_trigger = "ide-disk", -@@ -978,10 +1241,22 @@ static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL); - static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL); - static DEVICE_ATTR(calibrate, 0644, - applesmc_calibrate_show, applesmc_calibrate_store); -+static SENSOR_DEVICE_ATTR(low_norm_trigger_interval, 0644, -+ applesmc_accelerometer_show, applesmc_accelerometer_store, 0); -+static SENSOR_DEVICE_ATTR(high_norm_trigger_interval, 0644, -+ applesmc_accelerometer_show, applesmc_accelerometer_store, 1); -+static SENSOR_DEVICE_ATTR(low_norm_trigger, 0644, -+ applesmc_accelerometer_show, applesmc_accelerometer_store, 2); -+static SENSOR_DEVICE_ATTR(high_norm_trigger, 0644, -+ applesmc_accelerometer_show, applesmc_accelerometer_store, 3); - - static struct attribute *accelerometer_attributes[] = { - &dev_attr_position.attr, - &dev_attr_calibrate.attr, -+ &sensor_dev_attr_low_norm_trigger.dev_attr.attr, -+ &sensor_dev_attr_high_norm_trigger.dev_attr.attr, -+ &sensor_dev_attr_low_norm_trigger_interval.dev_attr.attr, -+ &sensor_dev_attr_high_norm_trigger_interval.dev_attr.attr, - NULL - }; - diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch deleted file mode 100644 index feef8da..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch-add-macbook3-trackpad.patch +++ /dev/null @@ -1,50 +0,0 @@ -Added IDs for macbook3,1 trackpad - -From: Chris Irwin <chris@chrisirwin.ca> - - ---- - - drivers/input/mouse/appletouch.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c -index 17381a9..dcd9a0d 100644 ---- a/drivers/input/mouse/appletouch.c -+++ b/drivers/input/mouse/appletouch.c -@@ -62,6 +62,11 @@ - #define GEYSER4_ISO_PRODUCT_ID 0x021B - #define GEYSER4_JIS_PRODUCT_ID 0x021C - -+/* Macbook3,1 devices */ -+#define GEYSER4_HF_ANSI_PRODUCT_ID 0x0229 -+#define GEYSER4_HF_ISO_PRODUCT_ID 0x022A -+#define GEYSER4_HF_JIS_PRODUCT_ID 0x021B -+ - #define ATP_DEVICE(prod) \ - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ - USB_DEVICE_ID_MATCH_INT_CLASS | \ -@@ -93,6 +98,11 @@ static struct usb_device_id atp_table [] = { - { ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) }, - { ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) }, - -+ /* Core2 Duo MacBook3,1 */ -+ { ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) }, -+ { ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) }, -+ { ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) }, -+ - /* Terminating entry */ - { } - }; -@@ -217,7 +227,10 @@ static inline int atp_is_geyser_3(struct atp *dev) - (productId == GEYSER3_JIS_PRODUCT_ID) || - (productId == GEYSER4_ANSI_PRODUCT_ID) || - (productId == GEYSER4_ISO_PRODUCT_ID) || -- (productId == GEYSER4_JIS_PRODUCT_ID); -+ (productId == GEYSER4_JIS_PRODUCT_ID) || -+ (productId == GEYSER4_HF_ANSI_PRODUCT_ID) || -+ (productId == GEYSER4_HF_ISO_PRODUCT_ID) || -+ (productId == GEYSER4_HF_JIS_PRODUCT_ID); - } - - /* diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch deleted file mode 100644 index d09b12a..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/appletouch.patch +++ /dev/null @@ -1,23 +0,0 @@ -Appletouch driver ATP_THRESHOLD fix. - -From: Ortwin Glück <odi@odi.ch> - - ---- - - drivers/input/mouse/appletouch.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c -index b4423a4..17381a9 100644 ---- a/drivers/input/mouse/appletouch.c -+++ b/drivers/input/mouse/appletouch.c -@@ -127,7 +127,7 @@ MODULE_DEVICE_TABLE (usb, atp_table); - * Threshold for the touchpad sensors. Any change less than ATP_THRESHOLD is - * ignored. - */ --#define ATP_THRESHOLD 5 -+#define ATP_THRESHOLD 3 - - /* Geyser initialization constants */ - #define ATP_GEYSER_MODE_READ_REQUEST_ID 1 diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch deleted file mode 100644 index f7b4cb9..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_display_all_controls_when_subsystem_id_is_wrong.patch +++ /dev/null @@ -1,28 +0,0 @@ -Display Macbook Pro 1st gen controls when the subsystem id is wrong (0x100). - -From: Nicolas Boichat <nicolas@boichat.ch> - - ---- - - sound/pci/hda/patch_sigmatel.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c -index 0401223..c0e626b 100644 ---- a/sound/pci/hda/patch_sigmatel.c -+++ b/sound/pci/hda/patch_sigmatel.c -@@ -2587,10 +2587,12 @@ static int patch_stac922x(struct hda_codec *codec) - case 0x106b1700: - case 0x106b0200: - case 0x106b1e00: -+ case 0x100: /* Invalid subsystem ID, happens randomly on -+ * MacBook Pro 1st generation -+ */ - spec->board_config = STAC_INTEL_MAC_V3; - break; - case 0x106b1a00: -- case 0x00000100: - spec->board_config = STAC_INTEL_MAC_V4; - break; - case 0x106b0a00: diff --git a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch b/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch deleted file mode 100644 index a559167..0000000 --- a/sys-kernel/mactel-linux-sources/files/2.6.24-mactel-patches-r148/sigmatel_audio_fix_macbook_v2.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fixes audio on Macbook v2. - -From: Marek Sterzik <marek@milimetr.org> - - ---- - - sound/pci/hda/patch_sigmatel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c -index c0e626b..e7995f6 100644 ---- a/sound/pci/hda/patch_sigmatel.c -+++ b/sound/pci/hda/patch_sigmatel.c -@@ -81,6 +81,7 @@ enum { - /* for backward compatibility */ - STAC_MACMINI, - STAC_MACBOOK, -+ STAC_MACBOOK_V2, - STAC_MACBOOK_PRO_V1, - STAC_MACBOOK_PRO_V2, - STAC_IMAC_INTEL, -@@ -905,6 +906,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = { - /* for backward compatibility */ - [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", |