Merge branch 'master' into detour

13 files changed, 649 insertions, 347 deletions

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..2850cef
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,174 @@
+bcm5974 (0.65) unstable; urgency=low
+
+  * Switch back to normal mode when closing
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sun, 14 Sep 2008 16:06:42 +0200
+
+bcm5974 (0.64) unstable; urgency=low
+
+  * Finger counting improved further
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 03 Sep 2008 21:58:38 +0200
+
+bcm5974 (0.63) unstable; urgency=low
+
+  * Finger pressure hysteresis added
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 03 Sep 2008 13:26:29 +0200
+
+bcm5974 (0.62) unstable; urgency=low
+
+  * Compatibility mode reverted
+  * BTN_TOUCH event added for mousedev
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Tue, 02 Sep 2008 20:46:51 +0200
+
+bcm5974 (0.61) unstable; urgency=low
+
+  * Smoother motion in mouse interface
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 01 Sep 2008 21:01:24 +0200
+
+bcm5974 (0.60) unstable; urgency=low
+
+  * New default mouse driver mode
+  * Mouse configuration parameters
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 01 Sep 2008 18:38:21 +0200
+
+bcm5974 (0.59) unstable; urgency=low
+
+  * Cleanup patch from Dmitry Torokhov
+  * Auto-suspend patch from Dmitry Torokhov
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 25 Jul 2008 20:14:05 +0200
+
+bcm5974 (0.58) unstable; urgency=low
+
+  * Name changes; use usbhid definitions, rename atp to bcm5974
+  * Input syncing moved to report functions, event type setup broken out
+  * Traffic functions added for open/close and suspend/resume logic
+  * Open/close and suspend/resume transition logic corrected
+  * Open/close serialized with respect to suspend/resume  
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 23 Jul 2008 02:20:10 +0200
+
+bcm5974 (0.57) unstable; urgency=low
+
+  * Keep reset_resume around
+  * Submitted to kernel.org
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sat, 19 Jul 2008 01:42:52 +0200
+
+bcm5974 (0.56) unstable; urgency=low
+
+  * Leave device initialization to hid; use mode-switch only
+  * Mode switch moved to atp_open and simplified
+  * Corrected cleanup action in atp_open
+  * Simplified control package detection
+  * Removed reset_resume, pre_reset, post_reset; not needed
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 18 Jul 2008 02:42:52 +0200
+
+bcm5974 (0.55) unstable; urgency=low
+
+  * Package updates.
+  * Reverting GFP_ATOMIC for irq handlers.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 09 Jul 2008 20:59:39 +0200
+
+bcm5974 (0.54) unstable; urgency=low
+
+  * And another one... finally got the bright idea to test it by
+    emulating the different product ids.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Tue, 08 Jul 2008 20:59:39 +0200
+
+bcm5974 (0.53) unstable; urgency=low
+
+  * Another typo in the post-install script.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 20:59:39 +0200
+
+bcm5974 (0.52) unstable; urgency=low
+
+  * Typo in the post-install script.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 20:09:39 +0200
+
+bcm5974 (0.51) unstable; urgency=low
+
+  * Fine-tuned signal-to-noise ratio, smoother mouse motion.
+  * Interrupt code got minor simplifications.
+  * GFP_ATOMIC completetly removed.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 18:09:39 +0200
+
+bcm5974 (0.5) unstable; urgency=low
+
+  * Working palm detection
+  * Changes for kernel.org
+  * DKMS introduced.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sun, 06 Jul 2008 20:59:39 +0200
+
+bcm5974 (0.42) unstable; urgency=low
+
+  * First button click registered.
+  * Hooks pre/post-reset added.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Tue, 01 Jul 2008 20:59:39 +0200
+
+bcm5974 (0.41) unstable; urgency=low
+
+  * The reset_resume kernel function added.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sun, 29 Jun 2008 20:59:39 +0200
+        
+bcm5974 (0.4) unstable; urgency=low
+
+  * Both finger pressure and width reported.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Sun, 29 Jun 2008 18:59:39 +0200
+
+bcm5974 (0.31) unstable; urgency=low
+
+  * Administrative changes for kernel.org.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 20:59:39 +0200
+
+bcm5974 (0.3) unstable; urgency=low
+
+  * Explicit device structure, use all packages.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 18:59:39 +0200
+
+bcm5974 (0.23) unstable; urgency=low
+
+  * Finger release not reported properly.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 17:59:39 +0200
+
+bcm5974 (0.22) unstable; urgency=low
+
+  * ABS coordinates more stable with synaptics.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Thu, 26 Jun 2008 20:59:39 +0200
+
+bcm5974 (0.21) unstable; urgency=low
+
+  * Fixed the relative coordinate scaling.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 25 Jun 2008 20:59:39 +0200
+
+bcm5974 (0.2) unstable; urgency=low
+
+  * Misinterpreted pressure input, noise reduction.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 25 Jun 2008 20:59:39 +0200
+
+bcm5974 (0.1) unstable; urgency=low
+
+  * First version.
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Tue, 24 Jun 2008 20:59:39 +0200
diff --git a/INSTALL b/INSTALL
index 7c7e975..195fd05 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,9 @@ Standing in the source directory, do:
 
 3. sudo ./scripts/bcm5974-post-install
 
-4. reboot (only if bcm5974 never was used before)
+4. sudo depmod -a
+
+5. reboot (or reload the bcm5974 module if already installed)
 
 For trouble-shooting, try running
 
diff --git a/Makefile b/Makefile
index 74335c8..6a04556 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for USB Network drivers
+# Makefile for input/mouse drivers
 #
 
 obj-m   := bcm5974.o
diff --git a/bcm5974-dkms-mkdeb/debian/README.Debian b/bcm5974-dkms-mkdeb/debian/README.Debian
index 7a1b108..1f170f1 100644
--- a/bcm5974-dkms-mkdeb/debian/README.Debian
+++ b/bcm5974-dkms-mkdeb/debian/README.Debian
@@ -1,10 +1,23 @@
 MODULE_NAME DKMS module for Debian
 
-This driver adds support for the multitouch trackpad on the new
-Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
+BCM5974: This driver adds support for the multitouch trackpad on the
+new Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
 appletouch driver on those computers, and integrates well with the
-synaptics driver of the Xorg system. 
+synaptics driver of the Xorg system.
 
-This package was automatically generated by the DKMS system,
-for distribution on Debian based operating systems.
+Known to work on Macbook Air and Macbook Pro Penryn.
 
+* Install the debian package (uses dkms)
+
+* Reboot
+
+Post installation
+
+* Make sure your /etc/X11/xorg.conf settings are sane.
+
+* If experiencing problems with your xorg settings, try the
+  bcm5974-diagnostics script (dkms installs the source under /usr/src/).
+
+Enjoy!
+
+Henrik Rydberg <rydberg@euromail.se>
diff --git a/bcm5974-dkms-mkdeb/debian/changelog b/bcm5974-dkms-mkdeb/debian/changelog
index 029a7bc..3ea1523 100644
--- a/bcm5974-dkms-mkdeb/debian/changelog
+++ b/bcm5974-dkms-mkdeb/debian/changelog
@@ -1,6 +1,5 @@
 MODULE_NAME-dkms (MODULE_VERSION) unstable; urgency=low
 
-  * Automatically packaged by DKMS.
+  * Switch back to normal mode when closing
 
  -- Henrik Rydberg <rydberg@euromail.se>  DATE_STAMP
-
diff --git a/bcm5974-dkms-mkdeb/debian/control b/bcm5974-dkms-mkdeb/debian/control
index ad717e6..c5497bf 100644
--- a/bcm5974-dkms-mkdeb/debian/control
+++ b/bcm5974-dkms-mkdeb/debian/control
@@ -4,8 +4,13 @@ Priority: optional
 Maintainer: Henrik Rydberg <rydberg@euromail.se>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
+Homepage: http://web.comhem.se/rydberg/Bits/
 
 Package: MODULE_NAME-dkms
 Architecture: all
 Depends: dkms (>= 1.95), bash (>> 1.99)
 Description: Apple USB BCM5974 Multitouch trackpad support (DKMS)
+ This driver adds support for the multitouch trackpad on the new
+ Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
+ appletouch driver on those computers, and integrates well with the
+ synaptics driver of the Xorg system. 
diff --git a/bcm5974-dkms-mkdeb/debian/copyright b/bcm5974-dkms-mkdeb/debian/copyright
index d690e83..e00b447 100644
--- a/bcm5974-dkms-mkdeb/debian/copyright
+++ b/bcm5974-dkms-mkdeb/debian/copyright
@@ -1,4 +1,41 @@
-GNU GENERAL PUBLIC LICENSE Version 2
+The bcm5974-dkms package was created using DKMS <dkms-devel@dell.com>
 
-See the LICENSE file of this distribution for details.
+Source URL: http://web.comhem.se/rydberg/Bits/
 
+Upstream Author: Henrik Rydberg <rydberg@euromail.se>
+
+Copyright:
+        Copyright (C) 2008      Henrik Rydberg (rydberg@euromail.se)
+
+        The USB initialization and package decoding was made by
+        Scott Shawcroft as part of the touchd user-space driver project:
+        Copyright (C) 2008      Scott Shawcroft (scott.shawcroft@gmail.com)
+
+        The BCM5974 driver is based on the appletouch driver:
+        Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)
+        Copyright (C) 2005      Johannes Berg (johannes@sipsolutions.net)
+        Copyright (C) 2005      Stelian Pop (stelian@popies.net)
+        Copyright (C) 2005      Frank Arnold (frank@scirocco-5v-turbo.de)
+        Copyright (C) 2005      Peter Osterlund (petero2@telia.com)
+        Copyright (C) 2005      Michael Hanselmann (linux-kernel@hansmi.ch)
+        Copyright (C) 2006      Nicolas Boichat (nicolas@boichat.ch)
+
+License:
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Packaging:
+        Copyright (C) 2008 by Henrik Rydberg <rydberg@euromail.se>
+        released under GPL 2
diff --git a/bcm5974-dkms-mkdeb/debian/dirs b/bcm5974-dkms-mkdeb/debian/dirs
index 2b01d9a..b601f22 100644
--- a/bcm5974-dkms-mkdeb/debian/dirs
+++ b/bcm5974-dkms-mkdeb/debian/dirs
@@ -1,2 +1 @@
 usr/src
-etc/modprobe.d
diff --git a/bcm5974.c b/bcm5974.c
index a7f070f..bf6c59f 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -39,42 +39,43 @@
 #include <linux/module.h>
 #include <linux/usb/input.h>
 #include <linux/hid.h>
+#include <linux/mutex.h>
 
-#define APPLE_VENDOR_ID         0x05AC
+#define USB_VENDOR_ID_APPLE             0x05ac
 
 /* MacbookAir, aka wellspring */
-#define ATP_WELLSPRING_ANSI     0x0223
-#define ATP_WELLSPRING_ISO      0x0224
-#define ATP_WELLSPRING_JIS      0x0225
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI     0x0223
+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO      0x0224
+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS      0x0225
 /* MacbookProPenryn, aka wellspring2 */
-#define ATP_WELLSPRING2_ANSI    0x0230
-#define ATP_WELLSPRING2_ISO     0x0231
-#define ATP_WELLSPRING2_JIS     0x0232
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI    0x0230
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO     0x0231
+#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS     0x0232
 
-#define ATP_DEVICE(prod) {                                      \
+#define BCM5974_DEVICE(prod) {                                  \
         .match_flags = (USB_DEVICE_ID_MATCH_DEVICE |            \
                         USB_DEVICE_ID_MATCH_INT_CLASS |         \
                         USB_DEVICE_ID_MATCH_INT_PROTOCOL),      \
-        .idVendor = APPLE_VENDOR_ID,                            \
+        .idVendor = USB_VENDOR_ID_APPLE,                        \
         .idProduct = (prod),                                    \
         .bInterfaceClass = USB_INTERFACE_CLASS_HID,             \
         .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE      \
 }
 
 /* table of devices that work with this driver */
-static const struct usb_device_id atp_table [] = {
+static const struct usb_device_id bcm5974_table[] = {
         /* MacbookAir1.1 */
-        ATP_DEVICE(ATP_WELLSPRING_ANSI),
-        ATP_DEVICE(ATP_WELLSPRING_ISO),
-        ATP_DEVICE(ATP_WELLSPRING_JIS),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
         /* MacbookProPenryn */
-        ATP_DEVICE(ATP_WELLSPRING2_ANSI),
-        ATP_DEVICE(ATP_WELLSPRING2_ISO),
-        ATP_DEVICE(ATP_WELLSPRING2_JIS),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
         /* Terminating entry */
         {}
 };
-MODULE_DEVICE_TABLE(usb, atp_table);
+MODULE_DEVICE_TABLE(usb, bcm5974_table);
 
 MODULE_AUTHOR("Henrik Rydberg");
 MODULE_DESCRIPTION("Apple USB BCM5974 multitouch driver");
@@ -104,7 +105,7 @@ struct tp_header {
 
 /* trackpad finger structure */
 struct tp_finger {
-        __le16 origin;          /* left/right origin? */
+        __le16 origin;          /* zero when switching track finger */
         __le16 abs_x;           /* absolute x coodinate */
         __le16 abs_y;           /* absolute y coodinate */
         __le16 rel_x;           /* relative x coodinate */
@@ -125,50 +126,40 @@ struct tp_data {
 };
 
 /* device-specific parameters */
-struct atp_params {
+struct bcm5974_param {
         int dim;                /* logical dimension */
+        int fuzz;               /* logical noise value */
         int devmin;             /* device minimum reading */
         int devmax;             /* device maximum reading */
 };
 
 /* device-specific configuration */
-struct atp_config {
+struct bcm5974_config {
         int ansi, iso, jis;     /* the product id of this device */
         int bt_ep;              /* the endpoint of the button interface */
         int bt_datalen;         /* data length of the button interface */
         int tp_ep;              /* the endpoint of the trackpad interface */
         int tp_datalen;         /* data length of the trackpad interface */
-        struct atp_params p;    /* finger pressure limits */
-        struct atp_params w;    /* finger width limits */
-        struct atp_params x;    /* horizontal limits */
-        struct atp_params y;    /* vertical limits */
-};
-
-/* logical trackpad state */
-struct tp_state {
-        int pressure;           /* finger pressure value */
-        int width;              /* finger width value */
-        int abs_x;              /* absolute x coordinate */
-        int abs_y;              /* absolute y coordinate */
-        int fingers;            /* number of fingers on trackpad */
+        struct bcm5974_param p; /* finger pressure limits */
+        struct bcm5974_param w; /* finger width limits */
+        struct bcm5974_param x; /* horizontal limits */
+        struct bcm5974_param y; /* vertical limits */
 };
 
 /* logical device structure */
-struct atp {
+struct bcm5974 {
         char phys[64];
         struct usb_device *udev;        /* usb device */
+        struct usb_interface *intf;     /* our interface */
         struct input_dev *input;        /* input dev */
-        struct atp_config cfg;          /* device configuration */
-        int open;                       /* >0: open, else closed */
-        int suspended;                  /* >0: suspended, else open */
+        struct bcm5974_config cfg;      /* device configuration */
+        struct mutex pm_mutex;          /* serialize access to open/suspend */
+        int opened;                     /* 1: opened, 0: closed */
         struct urb *bt_urb;             /* button usb request block */
         struct bt_data *bt_data;        /* button transferred data */
-        unsigned bt_prev_state;         /* logical button previous state */
-        unsigned bt_state;              /* logical button state */
         struct urb *tp_urb;             /* trackpad usb request block */
         struct tp_data *tp_data;        /* trackpad transferred data */
-        struct tp_state tp_state;       /* logical trackpad state */
-        unsigned tp_valid;              /* trackpad sensors valid */
+        int fingers;                    /* number of fingers on trackpad */
 };
 
 /* logical dimensions */
@@ -176,45 +167,54 @@ struct atp {
 #define DIM_WIDTH       16              /* maximum finger width */
 #define DIM_X           1280            /* maximum trackpad x value */
 #define DIM_Y           800             /* maximum trackpad y value */
-#define SNRATIO         50              /* signal to noise ratio */
+
+/* logical signal quality */
+#define SN_PRESSURE     45              /* pressure signal-to-noise ratio */
+#define SN_WIDTH        100             /* width signal-to-noise ratio */
+#define SN_COORD        250             /* coordinate signal-to-noise ratio */
+
+/* pressure thresholds */
+#define PRESSURE_LOW    (2 * DIM_PRESSURE / SN_PRESSURE)
+#define PRESSURE_HIGH   (3 * PRESSURE_LOW)
 
 /* device constants */
-static const struct atp_config atp_config_table[] = {
+static const struct bcm5974_config bcm5974_config_table[] = {
         {
-                ATP_WELLSPRING_ANSI,
-                ATP_WELLSPRING_ISO,
-                ATP_WELLSPRING_JIS,
+                USB_DEVICE_ID_APPLE_WELLSPRING_ANSI,
+                USB_DEVICE_ID_APPLE_WELLSPRING_ISO,
+                USB_DEVICE_ID_APPLE_WELLSPRING_JIS,
                 0x84, sizeof(struct bt_data),
                 0x81, sizeof(struct tp_data),
-                { DIM_PRESSURE, 0, 256 },
-                { DIM_WIDTH, 0, 2048 },
-                { DIM_X, -4824, 5342 },
-                { DIM_Y, -172, 5820 }
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
+                { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+                { DIM_X, DIM_X / SN_COORD, -4824, 5342 },
+                { DIM_Y, DIM_Y / SN_COORD, -172, 5820 }
         },
         {
-                ATP_WELLSPRING2_ANSI,
-                ATP_WELLSPRING2_ISO,
-                ATP_WELLSPRING2_JIS,
+                USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI,
+                USB_DEVICE_ID_APPLE_WELLSPRING2_ISO,
+                USB_DEVICE_ID_APPLE_WELLSPRING2_JIS,
                 0x84, sizeof(struct bt_data),
                 0x81, sizeof(struct tp_data),
-                { DIM_PRESSURE, 0, 256 },
-                { DIM_WIDTH, 0, 2048 },
-                { DIM_X, -4824, 5342 },
-                { DIM_Y, -172, 5820 }
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 },
+                { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+                { DIM_X, DIM_X / SN_COORD, -4824, 4824 },
+                { DIM_Y, DIM_Y / SN_COORD, -172, 4290 }
         },
         {}
 };
 
 /* return the device-specific configuration by device */
-static const struct atp_config *atp_product_config(struct usb_device *udev)
+static const struct bcm5974_config *bcm5974_get_config(struct usb_device *udev)
 {
         u16 id = le16_to_cpu(udev->descriptor.idProduct);
-        const struct atp_config *config;
-        for (config = atp_config_table; config->ansi; ++config)
-                if (config->ansi == id || config->iso == id ||
-                                config->jis == id)
-                        return config;
-        return atp_config_table;
+        const struct bcm5974_config *cfg;
+
+        for (cfg = bcm5974_config_table; cfg->ansi; ++cfg)
+                if (cfg->ansi == id || cfg->iso == id || cfg->jis == id)
+                        return cfg;
+
+        return bcm5974_config_table;
 }
 
 /* convert 16-bit little endian to signed integer */
@@ -224,142 +224,189 @@ static inline int raw2int(__le16 x)
 }
 
 /* scale device data to logical dimensions (asserts devmin < devmax) */
-static inline int int2scale(const struct atp_params *p, int x)
+static inline int int2scale(const struct bcm5974_param *p, int x)
 {
         return x * p->dim / (p->devmax - p->devmin);
 }
 
 /* all logical value ranges are [0,dim). */
-static inline int int2bound(const struct atp_params *p, int x)
+static inline int int2bound(const struct bcm5974_param *p, int x)
 {
         int s = int2scale(p, x);
-        return s < 0 ? 0 : s >= p->dim ? p->dim - 1 : s;
+
+        //return clamp_val(s, 0, p->dim - 1);
+        return s < 0 ? 0 : s >= p->dim ? p->dim - 1 : s;
 }
 
-/* convert button data to logical button state */
-static int compute_bt_state(struct atp *dev, int size)
+/* setup which logical events to report */
+static void setup_events_to_report(struct input_dev *input_dev,
+                                   const struct bcm5974_config *cfg)
+{
+        __set_bit(EV_ABS, input_dev->evbit);
+
+        input_set_abs_params(input_dev, ABS_PRESSURE,
+                                0, cfg->p.dim, cfg->p.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_TOOL_WIDTH,
+                                0, cfg->w.dim, cfg->w.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_X,
+                                0, cfg->x.dim, cfg->x.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                                0, cfg->y.dim, cfg->y.fuzz, 0);
+
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
+        __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
+        __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
+        __set_bit(BTN_LEFT, input_dev->keybit);
+}
+
+/* report button data as logical button state */
+static int report_bt_state(struct bcm5974 *dev, int size)
 {
         if (size != sizeof(struct bt_data))
                 return -EIO;
 
-        dev->bt_prev_state = dev->bt_state;
-        dev->bt_state = dev->bt_data->button;
+        input_report_key(dev->input, BTN_LEFT, dev->bt_data->button);
+        input_sync(dev->input);
 
         return 0;
 }
 
-/* convert trackpad data to logical trackpad state */
-static int compute_tp_state(struct atp *dev, int size)
+/* report trackpad data as logical trackpad state */
+static int report_tp_state(struct bcm5974 *dev, int size)
 {
-        const struct atp_config *c = &dev->cfg;
+        const struct bcm5974_config *c = &dev->cfg;
         const struct tp_finger *f = dev->tp_data->finger;
+        struct input_dev *input = dev->input;
         const int fingers = (size - 26) / 28;
-        struct tp_state *s = &dev->tp_state;
+        int raw_p, raw_w, raw_x, raw_y;
+        int ptest = 0, origin = 0, nmin = 0, nmax = 0;
+        int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0;
 
         if (size < 26 || (size - 26) % 28 != 0)
                 return -EIO;
 
-        if (!fingers) {
-                s->pressure = 0;
-                s->fingers = 0;
-                return 0;
+        /* always track the first finger; when detached, start over */
+        if (fingers) {
+                raw_p = raw2int(f->force_major);
+                raw_w = raw2int(f->size_major);
+                raw_x = raw2int(f->abs_x);
+                raw_y = raw2int(f->abs_y);
+
+                dprintk(9,
+                        "bcm5974: raw: p: %+05d w: %+05d x: %+05d y: %+05d\n",
+                        raw_p, raw_w, raw_x, raw_y);
+
+                ptest = int2bound(&c->p, raw_p);
+                origin = raw2int(f->origin);
+        }
+
+        /* while tracking finger still valid, count all fingers */
+        if (ptest > PRESSURE_LOW && origin) {
+                abs_p = ptest;
+                abs_w = int2bound(&c->w, raw_w);
+                abs_x = int2bound(&c->x, raw_x - c->x.devmin);
+                abs_y = int2bound(&c->y, c->y.devmax - raw_y);
+                for (; f != dev->tp_data->finger + fingers; f++) {
+                        ptest = int2bound(&c->p, raw2int(f->force_major));
+                        if (ptest > PRESSURE_LOW)
+                                nmax++;
+                        if (ptest > PRESSURE_HIGH)
+                                nmin++;
+                }
         }
 
-        dprintk(9, "bcm5974: p: %+05d w: %+05d x: %+05d y: %+05d f: %d\n",
-                raw2int(f->force_major), raw2int(f->size_major),
-                raw2int(f->abs_x), raw2int(f->abs_y), fingers);
+        if (dev->fingers < nmin)
+                dev->fingers = nmin;
+        if (dev->fingers > nmax)
+                dev->fingers = nmax;
+
+        input_report_key(input, BTN_TOUCH, dev->fingers > 0);
+        input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1);
+        input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2);
+        input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2);
+
+        input_report_abs(input, ABS_PRESSURE, abs_p);
+        input_report_abs(input, ABS_TOOL_WIDTH, abs_w);
+
+        if (abs_p) {
+                input_report_abs(input, ABS_X, abs_x);
+                input_report_abs(input, ABS_Y, abs_y);
+
+                dprintk(8,
+                        "bcm5974: abs: p: %+05d w: %+05d x: %+05d y: %+05d "
+                        "nmin: %d nmax: %d n: %d\n",
+                        abs_p, abs_w, abs_x, abs_y, nmin, nmax, dev->fingers);
 
-        s->pressure = int2bound(&c->p, raw2int(f->force_major));
-        s->width = int2bound(&c->w, raw2int(f->size_major));
-        s->abs_x = int2bound(&c->x, raw2int(f->abs_x) - c->x.devmin);
-        s->abs_y = int2bound(&c->y, c->y.devmax - raw2int(f->abs_y));
-        s->fingers = s->pressure > 0 ? fingers : 0;
+        }
+
+        input_sync(input);
 
         return 0;
 }
 
 /* Wellspring initialization constants */
-#define ATP_WELLSPRING_MODE_READ_REQUEST_ID     1
-#define ATP_WELLSPRING_MODE_WRITE_REQUEST_ID    9
-#define ATP_WELLSPRING_MODE_REQUEST_VALUE       0x300
-#define ATP_WELLSPRING_MODE_REQUEST_INDEX       0
-#define ATP_WELLSPRING_MODE_VENDOR_VALUE_1      0x01
-#define ATP_WELLSPRING_MODE_VENDOR_VALUE_2      0x05
-
-static int atp_wellspring_init(struct atp *dev)
+#define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID         1
+#define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID        9
+#define BCM5974_WELLSPRING_MODE_REQUEST_VALUE           0x300
+#define BCM5974_WELLSPRING_MODE_REQUEST_INDEX           0
+#define BCM5974_WELLSPRING_MODE_VENDOR_VALUE            0x01
+#define BCM5974_WELLSPRING_MODE_NORMAL_VALUE            0x08
+
+static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 {
         char *data = kmalloc(8, GFP_KERNEL);
-        int error = 0, size;
+        int retval = 0, size;
 
         if (!data) {
                 err("bcm5974: out of memory");
-                error = -ENOMEM;
-                goto error;
-        }
-
-        /* reset button endpoint */
-        if (usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
-                        USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
-                        0, dev->cfg.bt_ep, NULL, 0, 5000)) {
-                err("bcm5974: could not reset button endpoint");
-                error = -EIO;
-                goto error;
-        }
-
-        /* reset trackpad endpoint */
-        if (usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
-                        USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
-                        0, dev->cfg.tp_ep, NULL, 0, 5000)) {
-                err("bcm5974: could not reset trackpad endpoint");
-                error = -EIO;
-                goto error;
+                retval = -ENOMEM;
+                goto out;
         }
 
         /* read configuration */
         size = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
-                ATP_WELLSPRING_MODE_READ_REQUEST_ID,
-                USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                ATP_WELLSPRING_MODE_REQUEST_VALUE,
-                ATP_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
+                        BCM5974_WELLSPRING_MODE_READ_REQUEST_ID,
+                        USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
         if (size != 8) {
                 err("bcm5974: could not read from device");
-                error = -EIO;
-                goto error;
+                retval = -EIO;
+                goto out;
         }
 
         /* apply the mode switch */
-        data[0] = ATP_WELLSPRING_MODE_VENDOR_VALUE_1;
-        data[1] = ATP_WELLSPRING_MODE_VENDOR_VALUE_2;
+        data[0] = on ?
+                BCM5974_WELLSPRING_MODE_VENDOR_VALUE :
+                BCM5974_WELLSPRING_MODE_NORMAL_VALUE;
 
         /* write configuration */
         size = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
-                ATP_WELLSPRING_MODE_WRITE_REQUEST_ID,
-                USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                ATP_WELLSPRING_MODE_REQUEST_VALUE,
-                ATP_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
+                        BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID,
+                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
+                        BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
         if (size != 8) {
                 err("bcm5974: could not write to device");
-                error = -EIO;
-                goto error;
+                retval = -EIO;
+                goto out;
         }
 
-        dev->tp_valid = 0;
-
-        printk(KERN_INFO "bcm5974: Wellspring mode initialized.\n");
+        dprintk(2, "bcm5974: switched to %s mode.\n",
+                on ? "wellspring" : "normal");
 
+ out:
         kfree(data);
-        return 0;
-
-error:
-        kfree(data);
-        return error;
+        return retval;
 }
 
-static void irq_button(struct urb *urb)
+static void bcm5974_irq_button(struct urb *urb)
 {
-        struct atp *dev = urb->context;
+        struct bcm5974 *dev = urb->context;
         int error;
 
         switch (urb->status) {
@@ -376,17 +423,9 @@ static void irq_button(struct urb *urb)
                 goto exit;
         }
 
-        if (compute_bt_state(dev, dev->bt_urb->actual_length)) {
-                dprintk(1, "bcm5974: bad button package, length: %d)\n",
+        if (report_bt_state(dev, dev->bt_urb->actual_length))
+                dprintk(1, "bcm5974: bad button package, length: %d\n",
                         dev->bt_urb->actual_length);
-                goto exit;
-        }
-
-        /* only report button state changes */
-        if (dev->bt_state != dev->bt_prev_state) {
-                input_report_key(dev->input, BTN_LEFT, dev->bt_data->button);
-                input_sync(dev->input);
-        }
 
 exit:
         error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
@@ -394,10 +433,9 @@ exit:
                 err("bcm5974: button urb failed: %d", error);
 }
 
-static void irq_trackpad(struct urb *urb)
+static void bcm5974_irq_trackpad(struct urb *urb)
 {
-        struct atp *dev = urb->context;
-        struct tp_state *state = &dev->tp_state;
+        struct bcm5974 *dev = urb->context;
         int error;
 
         switch (urb->status) {
@@ -414,26 +452,13 @@ static void irq_trackpad(struct urb *urb)
                 goto exit;
         }
 
-        /* first sample data ignored */
-        if (!dev->tp_valid) {
-                dev->tp_valid = 1;
+        /* control response ignored */
+        if (dev->tp_urb->actual_length == 2)
                 goto exit;
-        }
 
-        if (compute_tp_state(dev, dev->tp_urb->actual_length)) {
-                dprintk(1, "bcm5974: bad trackpad package, length: %d)\n",
+        if (report_tp_state(dev, dev->tp_urb->actual_length))
+                dprintk(1, "bcm5974: bad trackpad package, length: %d\n",
                         dev->tp_urb->actual_length);
-                goto exit;
-        }
-
-        input_report_abs(dev->input, ABS_PRESSURE, state->pressure);
-        input_report_abs(dev->input, ABS_TOOL_WIDTH, state->width);
-        input_report_abs(dev->input, ABS_X, state->abs_x);
-        input_report_abs(dev->input, ABS_Y, state->abs_y);
-        input_report_key(dev->input, BTN_TOOL_FINGER, state->fingers == 1);
-        input_report_key(dev->input, BTN_TOOL_DOUBLETAP, state->fingers == 2);
-        input_report_key(dev->input, BTN_TOOL_TRIPLETAP, state->fingers > 2);
-        input_sync(dev->input);
 
 exit:
         error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
@@ -441,107 +466,184 @@ exit:
                 err("bcm5974: trackpad urb failed: %d", error);
 }
 
-static int atp_open(struct input_dev *input)
+/*
+ * The Wellspring trackpad, like many recent Apple trackpads, share
+ * the usb device with the keyboard. Since keyboards are usually
+ * handled by the HID system, the device ends up being handled by two
+ * modules. Setting up the device therefore becomes slightly
+ * complicated. To enable multitouch features, a mode switch is
+ * required, which is usually applied via the control interface of the
+ * device.  It can be argued where this switch should take place. In
+ * some drivers, like appletouch, the switch is made during
+ * probe. However, the hid module may also alter the state of the
+ * device, resulting in trackpad malfunction under certain
+ * circumstances. To get around this problem, there is at least one
+ * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to
+ * recieve a reset_resume request rather than the normal resume.
+ * Since the implementation of reset_resume is equal to mode switch
+ * plus start_traffic, it seems easier to always do the switch when
+ * starting traffic on the device.
+ */
+static int bcm5974_start_traffic(struct bcm5974 *dev)
 {
-        struct atp *dev = input_get_drvdata(input);
-
-        if (!dev->open) {
-                if (usb_submit_urb(dev->bt_urb, GFP_ATOMIC))
-                        goto error;
-                if (usb_submit_urb(dev->tp_urb, GFP_ATOMIC))
-                        goto err_free_bt_urb;
+        if (bcm5974_wellspring_mode(dev, true)) {
+                dprintk(1, "bcm5974: mode switch failed\n");
+                goto error;
         }
 
-        dev->open = 1;
-        dev->suspended = 0;
+        if (usb_submit_urb(dev->bt_urb, GFP_KERNEL))
+                goto error;
+
+        if (usb_submit_urb(dev->tp_urb, GFP_KERNEL))
+                goto err_kill_bt;
+
         return 0;
 
-err_free_bt_urb:
-        usb_free_urb(dev->bt_urb);
+err_kill_bt:
+        usb_kill_urb(dev->bt_urb);
 error:
         return -EIO;
 }
 
-static void atp_close(struct input_dev *input)
+static void bcm5974_pause_traffic(struct bcm5974 *dev)
 {
-        struct atp *dev = input_get_drvdata(input);
-
         usb_kill_urb(dev->tp_urb);
         usb_kill_urb(dev->bt_urb);
+        bcm5974_wellspring_mode(dev, false);
+}
+
+/*
+ * The code below implements open/close and manual suspend/resume.
+ * All functions may be called in random order.
+ *
+ * Opening a suspended device fails with EACCES - permission denied.
+ *
+ * Failing a resume leaves the device resumed but closed.
+ */
+static int bcm5974_open(struct input_dev *input)
+{
+        struct bcm5974 *dev = input_get_drvdata(input);
+        int error;
+
+        error = usb_autopm_get_interface(dev->intf);
+        if (error)
+                return error;
 
-        dev->open = 0;
-        dev->suspended = 0;
+        mutex_lock(&dev->pm_mutex);
+
+        error = bcm5974_start_traffic(dev);
+        if (!error)
+                dev->opened = 1;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        if (error)
+                usb_autopm_put_interface(dev->intf);
+
+        return error;
+}
+
+static void bcm5974_close(struct input_dev *input)
+{
+        struct bcm5974 *dev = input_get_drvdata(input);
+
+        mutex_lock(&dev->pm_mutex);
+
+        bcm5974_pause_traffic(dev);
+        dev->opened = 0;
+
+        mutex_unlock(&dev->pm_mutex);
+
+        usb_autopm_put_interface(dev->intf);
 }
 
-static int atp_probe(struct usb_interface *iface,
-                     const struct usb_device_id *id)
+static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message)
+{
+        struct bcm5974 *dev = usb_get_intfdata(iface);
+
+        mutex_lock(&dev->pm_mutex);
+
+        if (dev->opened)
+                bcm5974_pause_traffic(dev);
+
+        mutex_unlock(&dev->pm_mutex);
+
+        return 0;
+}
+
+static int bcm5974_resume(struct usb_interface *iface)
+{
+        struct bcm5974 *dev = usb_get_intfdata(iface);
+        int error = 0;
+
+        mutex_lock(&dev->pm_mutex);
+
+        if (dev->opened)
+                error = bcm5974_start_traffic(dev);
+
+        mutex_unlock(&dev->pm_mutex);
+
+        return error;
+}
+
+static int bcm5974_probe(struct usb_interface *iface,
+                         const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev(iface);
-        const struct atp_config *cfg;
-        struct atp *dev;
+        const struct bcm5974_config *cfg;
+        struct bcm5974 *dev;
         struct input_dev *input_dev;
-        int error = 0;
+        int error = -ENOMEM;
 
         /* find the product index */
-        cfg = atp_product_config(udev);
+        cfg = bcm5974_get_config(udev);
 
         /* allocate memory for our device state and initialize it */
-        dev = kzalloc(sizeof(struct atp), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!dev || !input_dev) {
                 err("bcm5974: out of memory");
-                error = -ENOMEM;
                 goto err_free_devs;
         }
 
         dev->udev = udev;
+        dev->intf = iface;
         dev->input = input_dev;
         dev->cfg = *cfg;
+        mutex_init(&dev->pm_mutex);
 
-        /* switch to raw sensor mode */
-        if (atp_wellspring_init(dev)) {
-                error = -EIO;
-                goto err_free_devs;
-        }
-
+        /* setup urbs */
         dev->bt_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!dev->bt_urb) {
-                error = -ENOMEM;
+        if (!dev->bt_urb)
                 goto err_free_devs;
-        }
 
         dev->tp_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!dev->tp_urb) {
-                error = -ENOMEM;
+        if (!dev->tp_urb)
                 goto err_free_bt_urb;
-        }
 
         dev->bt_data = usb_buffer_alloc(dev->udev,
-                dev->cfg.bt_datalen, GFP_KERNEL,
-                &dev->bt_urb->transfer_dma);
-        if (!dev->bt_data) {
-                error = -ENOMEM;
+                                        dev->cfg.bt_datalen, GFP_KERNEL,
+                                        &dev->bt_urb->transfer_dma);
+        if (!dev->bt_data)
                 goto err_free_urb;
-        }
 
         dev->tp_data = usb_buffer_alloc(dev->udev,
-                dev->cfg.tp_datalen, GFP_KERNEL,
-                &dev->tp_urb->transfer_dma);
-        if (!dev->tp_data) {
-                error = -ENOMEM;
+                                        dev->cfg.tp_datalen, GFP_KERNEL,
+                                        &dev->tp_urb->transfer_dma);
+        if (!dev->tp_data)
                 goto err_free_bt_buffer;
-        }
 
         usb_fill_int_urb(dev->bt_urb, udev,
-                usb_rcvintpipe(udev, cfg->bt_ep),
-                dev->bt_data, dev->cfg.bt_datalen,
-                irq_button, dev, 1);
+                         usb_rcvintpipe(udev, cfg->bt_ep),
+                         dev->bt_data, dev->cfg.bt_datalen,
+                         bcm5974_irq_button, dev, 1);
 
         usb_fill_int_urb(dev->tp_urb, udev,
-                usb_rcvintpipe(udev, cfg->tp_ep),
-                dev->tp_data, dev->cfg.tp_datalen,
-                irq_trackpad, dev, 1);
+                         usb_rcvintpipe(udev, cfg->tp_ep),
+                         dev->tp_data, dev->cfg.tp_datalen,
+                         bcm5974_irq_trackpad, dev, 1);
 
+        /* create bcm5974 device */
         usb_make_path(udev, dev->phys, sizeof(dev->phys));
         strlcat(dev->phys, "/input0", sizeof(dev->phys));
 
@@ -552,24 +654,10 @@ static int atp_probe(struct usb_interface *iface,
 
         input_set_drvdata(input_dev, dev);
 
-        input_dev->open = atp_open;
-        input_dev->close = atp_close;
-
-        set_bit(EV_ABS, input_dev->evbit);
-        input_set_abs_params(input_dev, ABS_PRESSURE,
-                0, cfg->p.dim, cfg->p.dim / SNRATIO, 0);
-        input_set_abs_params(input_dev, ABS_TOOL_WIDTH,
-                0, cfg->w.dim, cfg->w.dim / SNRATIO, 0);
-        input_set_abs_params(input_dev, ABS_X,
-                0, cfg->x.dim, cfg->x.dim / SNRATIO, 0);
-        input_set_abs_params(input_dev, ABS_Y,
-                0, cfg->y.dim, cfg->y.dim / SNRATIO, 0);
+        input_dev->open = bcm5974_open;
+        input_dev->close = bcm5974_close;
 
-        set_bit(EV_KEY, input_dev->evbit);
-        set_bit(BTN_TOOL_FINGER, input_dev->keybit);
-        set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
-        set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
-        set_bit(BTN_LEFT, input_dev->keybit);
+        setup_events_to_report(input_dev, cfg);
 
         error = input_register_device(dev->input);
         if (error)
@@ -592,99 +680,48 @@ err_free_bt_urb:
         usb_free_urb(dev->bt_urb);
 err_free_devs:
         usb_set_intfdata(iface, NULL);
-        kfree(dev);
         input_free_device(input_dev);
+        kfree(dev);
         return error;
 }
 
-static void atp_disconnect(struct usb_interface *iface)
+static void bcm5974_disconnect(struct usb_interface *iface)
 {
-        struct atp *dev = usb_get_intfdata(iface);
+        struct bcm5974 *dev = usb_get_intfdata(iface);
 
         usb_set_intfdata(iface, NULL);
 
-        if (dev) {
-                input_unregister_device(dev->input);
-                usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
+        input_unregister_device(dev->input);
+        usb_buffer_free(dev->udev, dev->cfg.tp_datalen,
                         dev->tp_data, dev->tp_urb->transfer_dma);
-                usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
+        usb_buffer_free(dev->udev, dev->cfg.bt_datalen,
                         dev->bt_data, dev->bt_urb->transfer_dma);
-                usb_free_urb(dev->tp_urb);
-                usb_free_urb(dev->bt_urb);
-                kfree(dev);
-        }
-
-        printk(KERN_INFO "bcm5974: disconnected\n");
-}
-
-static int atp_suspend(struct usb_interface *iface, pm_message_t message)
-{
-        struct atp *dev = usb_get_intfdata(iface);
-
-        if (dev) {
-                if (!dev->suspended)
-                        atp_close(dev->input);
-                dev->suspended++;
-        }
-
-        return 0;
-}
-
-static int atp_resume(struct usb_interface *iface)
-{
-        struct atp *dev = usb_get_intfdata(iface);
-        int error = 0;
-
-        if (dev && dev->suspended) {
-                if (!--dev->suspended)
-                        error = atp_open(dev->input);
-        }
-
-        return error;
-}
-
-static int atp_reset_resume(struct usb_interface *iface)
-{
-        struct atp *dev = usb_get_intfdata(iface);
-
-        if (dev && atp_wellspring_init(dev))
-                printk(KERN_INFO "bcm5974: warning: reset failed\n");
-
-        return atp_resume(iface);
-}
-
-static int atp_pre_reset(struct usb_interface *iface)
-{
-        return atp_suspend(iface, PMSG_ON);
-}
-
-static int atp_post_reset(struct usb_interface *iface)
-{
-        return atp_reset_resume(iface);
+        usb_free_urb(dev->tp_urb);
+        usb_free_urb(dev->bt_urb);
+        kfree(dev);
 }
 
-static struct usb_driver atp_driver = {
-        .name = "bcm5974",
-        .probe = atp_probe,
-        .disconnect = atp_disconnect,
-        .suspend = atp_suspend,
-        .resume = atp_resume,
-        .reset_resume = atp_reset_resume,
-        .pre_reset = atp_pre_reset,
-        .post_reset = atp_post_reset,
-        .id_table = atp_table,
+static struct usb_driver bcm5974_driver = {
+        .name                   = "bcm5974",
+        .probe                  = bcm5974_probe,
+        .disconnect             = bcm5974_disconnect,
+        .suspend                = bcm5974_suspend,
+        .resume                 = bcm5974_resume,
+        .reset_resume           = bcm5974_resume,
+        .id_table               = bcm5974_table,
+        .supports_autosuspend   = 1,
 };
 
-static int __init atp_init(void)
+static int __init bcm5974_init(void)
 {
-        return usb_register(&atp_driver);
+        return usb_register(&bcm5974_driver);
 }
 
-static void __exit atp_exit(void)
+static void __exit bcm5974_exit(void)
 {
-        usb_deregister(&atp_driver);
+        usb_deregister(&bcm5974_driver);
 }
 
-module_init(atp_init);
-module_exit(atp_exit);
+module_init(bcm5974_init);
+module_exit(bcm5974_exit);
 
diff --git a/dkms.conf b/dkms.conf
index 89d112e..aec50fa 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,8 +1,9 @@
 PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.5"
+PACKAGE_VERSION="0.65"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/input/mouse"
+PRE_INSTALL="scripts/bcm5974-pre-install"
 POST_INSTALL="scripts/bcm5974-post-install"
 POST_REMOVE="scripts/bcm5974-post-remove"
diff --git a/scripts/bcm5974-diagnostics b/scripts/bcm5974-diagnostics
index 0322158..acd0bf4 100755
--- a/scripts/bcm5974-diagnostics
+++ b/scripts/bcm5974-diagnostics
@@ -131,22 +131,13 @@ if [ -f $DEVPATH ]; then
         echo \* $DEVPATH: module is registered
     else
         echo \* $DEVPATH: module is NOT registered
-        echo No help on this one...
+        echo "Please double-check the quirks settings in $DRIVMOD"
         exit 1
     fi
 else
     echo \* $DEVPATH: does not exist, ignore
 fi
 
-# Was the $DRIVER properly initialized?
-WELLSPRING=`dmesg|grep $DRIVER|grep Wellspring`
-if [ "$WELLSPRING" != "" ]; then
-    echo \* $DRIVER: Wellspring was initialized
-else
-    echo \* $DRIVER: Wellspring was NOT initialized
-    exit 1
-fi
-
 # Do we have synaptics working properly?
 typeset -i SYNLINES=`synclient -l|wc -l`
 if [ $SYNLINES -gt 10 ]; then
diff --git a/scripts/bcm5974-post-install b/scripts/bcm5974-post-install
index 21e989e..5674d40 100755
--- a/scripts/bcm5974-post-install
+++ b/scripts/bcm5974-post-install
@@ -25,17 +25,19 @@ ETCPATH=/etc/modprobe.d/$DRIVER
 echo -----------------------------------------------------------------------
 
 DIR=`dirname $0`
+LSUSB=/usr/sbin/lsusb
+
 PAT_HEAD="options usbhid quirks="
-PAT_MBA="0x05ac:0x022"
-PAT_MBP="0x05ac:0x023"
-MATCH_MBA=$PAT_HEAD$PAT_MBA
-MATCH_MBB=$PAT_HEAD$PAT_MBB
+PAT[0]="05ac:022"
+PAT[1]="05ac:023"
+MATCH[0]=${PAT_HEAD}0x05ac:0x022
+MATCH[1]=${PAT_HEAD}0x05ac:0x023
 
-if [ -x /usr/sbin/lsusb ]; then
-    if [ "lsusb|grep $PAT_MBA" != "" ]; then
-        SED="s/#$MATCH_MBA/$MATCH_MBA/"
-    elif [ $has_mbb -gt 0 ]; then
-        SED="s/#$MATCH_MBP/$MATCH_MBP/"
+if [ -x $LSUSB ]; then
+    if [ "`$LSUSB|grep ${PAT[0]}`" != "" ]; then
+        SED="s/#${MATCH[0]}/${MATCH[0]}/"
+    elif [ "`$LSUSB|grep ${PAT[1]}`" != "" ]; then
+        SED="s/#${MATCH[1]}/${MATCH[1]}/"
     else
         echo No suitable device found
         exit 1
diff --git a/scripts/bcm5974-pre-install b/scripts/bcm5974-pre-install
new file mode 100755
index 0000000..1e2b864
--- /dev/null
+++ b/scripts/bcm5974-pre-install
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# bcm5943-pre-install - check system before installing the bcm5974
+#
+# Copyright (C) 2008       Henrik Rydberg (rydberg@euromail.se)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+DRIVER=bcm5974
+LSUSB=/usr/sbin/lsusb
+
+PAT[0]="05ac:022"
+PAT[1]="05ac:023"
+
+if [ -x $LSUSB ]; then
+    if [ "`$LSUSB|grep ${PAT[0]}`" != "" ]; then
+        exit 0
+    elif [ "`$LSUSB|grep ${PAT[1]}`" != "" ]; then
+        exit 0
+    else
+        echo bcm5974: no suitable device found
+        exit -1
+    fi
+else
+    echo bcm5974: cannot determine device type
+    exit -1
+fi
+
+exit 0