lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [47/275] input: bcm5974: Add support for MacBookAir3
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Edgar (gimli) Hucek <gimli@dark-green.com>

    commit 6021afcf19d8c6f5db6d11cadcfb6a22d0c28a48 upstream.

    This patch adds support for the MacBookAir3,1 and MacBookAir3,2
    models.

    [rydberg@euromail.se: touchpad range calibration]
    Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/input/mouse/bcm5974.c | 40 ++++++++++++++++++++++++++++++++++++++++
    1 file changed, 40 insertions(+)

    Index: linux-2.6.35.y/drivers/input/mouse/bcm5974.c
    ===================================================================
    --- linux-2.6.35.y.orig/drivers/input/mouse/bcm5974.c 2011-03-29 22:51:50.618427970 -0700
    +++ linux-2.6.35.y/drivers/input/mouse/bcm5974.c 2011-03-29 23:02:59.158321707 -0700
    @@ -55,6 +55,14 @@
    #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
    #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
    #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
    +/* MacbookAir3,2 (unibody), aka wellspring5 */
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x023f
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0240
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0241
    +/* MacbookAir3,1 (unibody), aka wellspring4 */
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243
    +#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244

    #define BCM5974_DEVICE(prod) { \
    .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
    @@ -80,6 +88,14 @@
    BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
    BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
    BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
    + /* MacbookAir3,2 */
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
    + /* MacbookAir3,1 */
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
    + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
    /* Terminating entry */
    {}
    };
    @@ -234,6 +250,30 @@
    { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
    { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
    },
    + {
    + USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI,
    + USB_DEVICE_ID_APPLE_WELLSPRING4_ISO,
    + USB_DEVICE_ID_APPLE_WELLSPRING4_JIS,
    + HAS_INTEGRATED_BUTTON,
    + 0x84, sizeof(struct bt_data),
    + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
    + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
    + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
    + { DIM_X, DIM_X / SN_COORD, -4620, 5140 },
    + { DIM_Y, DIM_Y / SN_COORD, -150, 6600 }
    + },
    + {
    + USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI,
    + USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO,
    + USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS,
    + HAS_INTEGRATED_BUTTON,
    + 0x84, sizeof(struct bt_data),
    + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
    + { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
    + { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
    + { DIM_X, DIM_X / SN_COORD, -4616, 5112 },
    + { DIM_Y, DIM_Y / SN_COORD, -142, 5234 }
    + },
    {}
    };


    \
     
     \ /
      Last update: 2011-03-31 00:07    [W:3.151 / U:0.108 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site