Pull sn-handle-sc-powerdown into release branch

[powerpc.git] / drivers / input / mouse / lifebook.c

diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index a5a1fb3..5ccc3ef 100644 (file)
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -27,6 +27,13 @@ static struct dmi_system_id lifebook_dmi_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
                },
        },
+       {
+               .ident = "Lifebook B142",
+               .matches = {
+                       DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
+               },
+
+       },
        { }
 };
 
@@ -34,7 +41,7 @@ static struct dmi_system_id lifebook_dmi_table[] = {
 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
 {
        unsigned char *packet = psmouse->packet;
-       struct input_dev *dev = &psmouse->dev;
+       struct input_dev *dev = psmouse->dev;
 
        if (psmouse->pktcnt != 3)
                return PSMOUSE_GOOD_DATA;
@@ -63,7 +70,7 @@ static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_re
        return PSMOUSE_FULL_PACKET;
 }
 
-static int lifebook_initialize(struct psmouse *psmouse)
+static int lifebook_absolute_mode(struct psmouse *psmouse)
 {
        struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param;
@@ -82,32 +89,55 @@ static int lifebook_initialize(struct psmouse *psmouse)
        return 0;
 }
 
+static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolution)
+{
+       unsigned char params[] = { 0, 1, 2, 2, 3 };
+
+       if (resolution == 0 || resolution > 400)
+               resolution = 400;
+
+       ps2_command(&psmouse->ps2dev, &params[resolution / 100], PSMOUSE_CMD_SETRES);
+       psmouse->resolution = 50 << params[resolution / 100];
+}
+
 static void lifebook_disconnect(struct psmouse *psmouse)
 {
        psmouse_reset(psmouse);
 }
 
-int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
-                    int set_properties)
+int lifebook_detect(struct psmouse *psmouse, int set_properties)
 {
-        if (!dmi_check_system(lifebook_dmi_table) && max_proto != PSMOUSE_LIFEBOOK)
+        if (!dmi_check_system(lifebook_dmi_table))
                 return -1;
 
        if (set_properties) {
-               psmouse->vendor = "Fujitsu Lifebook";
-               psmouse->name = "TouchScreen";
-               psmouse->dev.evbit[0] = BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
-               psmouse->dev.keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
-               psmouse->dev.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
-               psmouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y);
-               input_set_abs_params(&psmouse->dev, ABS_X, 0, 1024, 0, 0);
-               input_set_abs_params(&psmouse->dev, ABS_Y, 0, 1024, 0, 0);
-
-               psmouse->protocol_handler = lifebook_process_byte;
-               psmouse->disconnect = lifebook_disconnect;
-               psmouse->reconnect  = lifebook_initialize;
-               psmouse->pktsize = 3;
+               psmouse->vendor = "Fujitsu";
+               psmouse->name = "Lifebook TouchScreen";
        }
 
-        return lifebook_initialize(psmouse);
+        return 0;
 }
+
+int lifebook_init(struct psmouse *psmouse)
+{
+       struct input_dev *input_dev = psmouse->dev;
+
+       if (lifebook_absolute_mode(psmouse))
+               return -1;
+
+       input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
+       input_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+       input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+       input_set_abs_params(input_dev, ABS_X, 0, 1024, 0, 0);
+       input_set_abs_params(input_dev, ABS_Y, 0, 1024, 0, 0);
+
+       psmouse->protocol_handler = lifebook_process_byte;
+       psmouse->set_resolution = lifebook_set_resolution;
+       psmouse->disconnect = lifebook_disconnect;
+       psmouse->reconnect  = lifebook_absolute_mode;
+       psmouse->pktsize = 3;
+
+       return 0;
+}
+