Revision: 127 http://svn.sourceforge.net/mactel-linux/?rev=127&view=rev Author: nboichat Date: 2007-05-27 10:36:01 -0700 (Sun, 27 May 2007)
Log Message: ----------- Update patches to the latest git. Add back audio patches, and remove applesmc-use-input-polldev patch which needs others patches from the -mm tree. Modified Paths: -------------- trunk/kernel/mactel-patches-2.6.22/applesmc_int.patch trunk/kernel/mactel-patches-2.6.22/series Added Paths: ----------- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch Removed Paths: ------------- trunk/kernel/mactel-patches-2.6.22/applesmc-use-input-polldev.patch Deleted: trunk/kernel/mactel-patches-2.6.22/applesmc-use-input-polldev.patch =================================================================== --- trunk/kernel/mactel-patches-2.6.22/applesmc-use-input-polldev.patch 2007-05-27 11:21:30 UTC (rev 126) +++ trunk/kernel/mactel-patches-2.6.22/applesmc-use-input-polldev.patch 2007-05-27 17:36:01 UTC (rev 127) @@ -1,221 +0,0 @@ -HWMON: applesmc - convert to use input-polldev. - -From: Nicolas Boichat <[EMAIL PROTECTED]> - -Switch to using input-polldev skeleton instead of implementing -polling loop by itself. This also fixes problem with trylock -on a mutex in atomic context. - -Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]> ---- - - drivers/hwmon/Kconfig | 1 + - drivers/hwmon/applesmc.c | 83 +++++++++++++++++----------------------------- - 2 files changed, 31 insertions(+), 53 deletions(-) - -diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig -index 4d1cb5b..cfb2a04 100644 ---- a/drivers/hwmon/Kconfig -+++ b/drivers/hwmon/Kconfig -@@ -623,6 +623,7 @@ config SENSORS_APPLESMC - depends on HWMON && INPUT && X86 - select NEW_LEDS - select LEDS_CLASS -+ select INPUT_POLLDEV - default n - help - This driver provides support for the Apple System Management -diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index fd1281f..eb81a64 100644 ---- a/drivers/hwmon/applesmc.c -+++ b/drivers/hwmon/applesmc.c -@@ -28,7 +28,7 @@ - - #include <linux/delay.h> - #include <linux/platform_device.h> --#include <linux/input.h> -+#include <linux/input-polldev.h> - #include <linux/kernel.h> - #include <linux/module.h> - #include <linux/timer.h> -@@ -59,9 +59,9 @@ - - #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) */ -+#define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */ - --#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */ -+#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */ - - #define MOTION_SENSOR_X_KEY "MO_X" /* r-o sp78 (2 bytes) */ - #define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o sp78 (2 bytes) */ -@@ -99,7 +99,7 @@ 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 APPLESMC_POLL_PERIOD (HZ/20) /* poll for input every 1/20s */ -+#define APPLESMC_POLL_INTERVAL 50 /* msecs */ - #define APPLESMC_INPUT_FUZZ 4 /* input event threshold */ - #define APPLESMC_INPUT_FLAT 4 - -@@ -121,8 +121,7 @@ static const int debug; - static struct platform_device *pdev; - static s16 rest_x; - static s16 rest_y; --static struct timer_list applesmc_timer; --static struct input_dev *applesmc_idev; -+static struct input_polled_dev *applesmc_idev; - static struct class_device *hwmon_class_dev; - - /* Indicates whether this computer has an accelerometer. */ -@@ -134,7 +133,7 @@ static unsigned int applesmc_light; - /* Indicates which temperature sensors set to use. */ - static unsigned int applesmc_temperature_set; - --static struct mutex applesmc_lock; -+static DEFINE_MUTEX(applesmc_lock); - - /* - * Last index written to key_at_index sysfs file, and value to use for all other -@@ -451,27 +450,12 @@ static void applesmc_calibrate(void) - rest_x = -rest_x; - } - --static int applesmc_idev_open(struct input_dev *dev) --{ -- add_timer(&applesmc_timer); -- -- return 0; --} -- --static void applesmc_idev_close(struct input_dev *dev) --{ -- del_timer_sync(&applesmc_timer); --} -- --static void applesmc_idev_poll(unsigned long unused) -+static void applesmc_idev_poll(struct input_polled_dev *dev) - { -+ struct input_dev *idev = dev->input; - s16 x, y; - -- /* Cannot sleep. Try nonblockingly. If we fail, try again later. */ -- if (!mutex_trylock(&applesmc_lock)) { -- mod_timer(&applesmc_timer, jiffies + APPLESMC_POLL_PERIOD); -- return; -- } -+ mutex_lock(&applesmc_lock); - - if (applesmc_read_motion_sensor(SENSOR_X, &x)) - goto out; -@@ -479,13 +463,11 @@ static void applesmc_idev_poll(unsigned long unused) - goto out; - - x = -x; -- input_report_abs(applesmc_idev, ABS_X, x - rest_x); -- input_report_abs(applesmc_idev, ABS_Y, y - rest_y); -- input_sync(applesmc_idev); -+ input_report_abs(idev, ABS_X, x - rest_x); -+ input_report_abs(idev, ABS_Y, y - rest_y); -+ input_sync(idev); - - out: -- mod_timer(&applesmc_timer, jiffies + APPLESMC_POLL_PERIOD); -- - mutex_unlock(&applesmc_lock); - } - -@@ -817,8 +799,7 @@ static ssize_t applesmc_key_at_index_read_show(struct device *dev, - - if (!ret) { - return info[0]; -- } -- else { -+ } else { - return ret; - } - } -@@ -1089,6 +1070,7 @@ static int applesmc_dmi_match(struct dmi_system_id *id) - /* Create accelerometer ressources */ - static int applesmc_create_accelerometer(void) - { -+ struct input_dev *idev; - int ret; - - ret = sysfs_create_group(&pdev->dev.kobj, -@@ -1096,40 +1078,37 @@ static int applesmc_create_accelerometer(void) - if (ret) - goto out; - -- applesmc_idev = input_allocate_device(); -+ applesmc_idev = input_allocate_polled_device(); - if (!applesmc_idev) { - ret = -ENOMEM; - goto out_sysfs; - } - -+ applesmc_idev->poll = applesmc_idev_poll; -+ applesmc_idev->poll_interval = APPLESMC_POLL_INTERVAL; -+ - /* initial calibrate for the input device */ - applesmc_calibrate(); - -- /* initialize the input class */ -- applesmc_idev->name = "applesmc"; -- applesmc_idev->id.bustype = BUS_HOST; -- applesmc_idev->dev.parent = &pdev->dev; -- applesmc_idev->evbit[0] = BIT(EV_ABS); -- applesmc_idev->open = applesmc_idev_open; -- applesmc_idev->close = applesmc_idev_close; -- input_set_abs_params(applesmc_idev, ABS_X, -+ /* initialize the input device */ -+ idev = applesmc_idev->input; -+ idev->name = "applesmc"; -+ idev->id.bustype = BUS_HOST; -+ idev->dev.parent = &pdev->dev; -+ idev->evbit[0] = BIT(EV_ABS); -+ input_set_abs_params(idev, ABS_X, - -256, 256, APPLESMC_INPUT_FUZZ, APPLESMC_INPUT_FLAT); -- input_set_abs_params(applesmc_idev, ABS_Y, -+ input_set_abs_params(idev, ABS_Y, - -256, 256, APPLESMC_INPUT_FUZZ, APPLESMC_INPUT_FLAT); - -- ret = input_register_device(applesmc_idev); -+ ret = input_register_polled_device(applesmc_idev); - if (ret) - goto out_idev; - -- /* start up our timer for the input device */ -- init_timer(&applesmc_timer); -- applesmc_timer.function = applesmc_idev_poll; -- applesmc_timer.expires = jiffies + APPLESMC_POLL_PERIOD; -- - return 0; - - out_idev: -- input_free_device(applesmc_idev); -+ input_free_polled_device(applesmc_idev); - - out_sysfs: - sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group); -@@ -1142,8 +1121,8 @@ out: - /* Release all ressources used by the accelerometer */ - static void applesmc_release_accelerometer(void) - { -- del_timer_sync(&applesmc_timer); -- input_unregister_device(applesmc_idev); -+ input_unregister_polled_device(applesmc_idev); -+ input_free_polled_device(applesmc_idev); - sysfs_remove_group(&pdev->dev.kobj, &accelerometer_attributes_group); - } - -@@ -1180,8 +1159,6 @@ static int __init applesmc_init(void) - int count; - int i; - -- mutex_init(&applesmc_lock); -- - if (!dmi_check_system(applesmc_whitelist)) { - printk(KERN_WARNING "applesmc: supported laptop not found!\n"); - ret = -ENODEV; Modified: trunk/kernel/mactel-patches-2.6.22/applesmc_int.patch =================================================================== --- trunk/kernel/mactel-patches-2.6.22/applesmc_int.patch 2007-05-27 11:21:30 UTC (rev 126) +++ trunk/kernel/mactel-patches-2.6.22/applesmc_int.patch 2007-05-27 17:36:01 UTC (rev 127) @@ -9,7 +9,7 @@ 1 files changed, 293 insertions(+), 23 deletions(-) diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c -index eb81a64..ff56afd 100644 +index fd1281f..e523851 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -39,14 +39,20 @@ @@ -41,7 +41,7 @@ + #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) */ + #define BACKLIGHT_KEY "LKSB" /* w-o {lkb (2 bytes) */ @@ -68,6 +76,19 @@ #define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o sp78 (2 bytes) */ #define MOTION_SENSOR_KEY "MOCN" /* r/w ui16 */ @@ -62,7 +62,7 @@ #define FANS_COUNT "FNum" /* r-o ui8 */ #define FANS_MANUAL "FS! " /* r-w ui16 */ #define FAN_ACTUAL_SPEED "F0Ac" /* r-o fpe2 (2 bytes) */ -@@ -347,12 +368,79 @@ static int applesmc_read_motion_sensor(int index, s16* value) +@@ -348,12 +369,79 @@ static int applesmc_read_motion_sensor(int index, s16* value) } /* @@ -143,7 +143,7 @@ u8 buffer[2]; if (!applesmc_accelerometer) -@@ -360,32 +448,79 @@ static int applesmc_device_init(void) +@@ -361,32 +449,79 @@ static int applesmc_device_init(void) mutex_lock(&applesmc_lock); @@ -245,7 +245,7 @@ out: mutex_unlock(&applesmc_lock); -@@ -430,9 +565,16 @@ static int applesmc_resume(struct platform_device *dev) +@@ -431,9 +566,16 @@ static int applesmc_resume(struct platform_device *dev) return applesmc_device_init(); } @@ -262,7 +262,7 @@ .driver = { .name = "applesmc", .owner = THIS_MODULE, -@@ -894,6 +1036,122 @@ static ssize_t applesmc_key_at_index_store(struct device *dev, +@@ -913,6 +1055,122 @@ static ssize_t applesmc_key_at_index_store(struct device *dev, return count; } @@ -385,7 +385,7 @@ static struct led_classdev applesmc_backlight = { .name = "smc:kbd_backlight", .default_trigger = "nand-disk", -@@ -905,10 +1163,22 @@ static DEVICE_ATTR(name, 0444, applesmc_name_show, NULL); +@@ -924,10 +1182,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); Modified: trunk/kernel/mactel-patches-2.6.22/series =================================================================== --- trunk/kernel/mactel-patches-2.6.22/series 2007-05-27 11:21:30 UTC (rev 126) +++ trunk/kernel/mactel-patches-2.6.22/series 2007-05-27 17:36:01 UTC (rev 127) @@ -1,6 +1,7 @@ # This series applies on GIT commit c420bc9f09a0926b708c3edb27eacba434a4f4ba +sigmatel_audio2.patch +sigmatel_audio3.patch applesmc_add_name.patch -applesmc-use-input-polldev.patch applesmc_int.patch appletouch.patch appleir.patch Added: trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch =================================================================== --- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch (rev 0) +++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio2.patch 2007-05-27 17:36:01 UTC (rev 127) @@ -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 a6a0a80..6dea603 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -527,12 +527,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, +@@ -549,8 +561,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, Added: trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch =================================================================== --- trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch (rev 0) +++ trunk/kernel/mactel-patches-2.6.22/sigmatel_audio3.patch 2007-05-27 17:36:01 UTC (rev 127) @@ -0,0 +1,22 @@ +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 6dea603..0ed865c 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -1991,6 +1991,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; 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 DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Mactel-linux-devel mailing list Mactel-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel