aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/psmouse-base.c
diff options
context:
space:
mode:
authorStefan Lucke <stefan@lucke.in-berlin.de>2007-02-18 01:49:10 -0500
committerDmitry Torokhov <dtor@insightbb.com>2007-02-18 01:49:10 -0500
commit24bf10ab2d72863a14187905fd992ca8119c809e (patch)
tree2726d9dfe11618a4a77eacae945e6b92c1a5f405 /drivers/input/mouse/psmouse-base.c
parent62b529a7b9c11880a8820494a25db0e2ecdf3bed (diff)
Input: psmouse - add support for eGalax PS/2 touchscreen controller
Based on the touchkit USB and lifebook PS/2 touchscreen driver. The egalax touchsreen controller (PS/2 or USB version) is used in this 7" device: http://www.cartft.com/catalog/il/449 Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
-rw-r--r--drivers/input/mouse/psmouse-base.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 0fe5869d7d4c..eb63855f7cc1 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -28,6 +28,7 @@
28#include "alps.h" 28#include "alps.h"
29#include "lifebook.h" 29#include "lifebook.h"
30#include "trackpoint.h" 30#include "trackpoint.h"
31#include "touchkit_ps2.h"
31 32
32#define DRIVER_DESC "PS/2 mouse driver" 33#define DRIVER_DESC "PS/2 mouse driver"
33 34
@@ -605,14 +606,20 @@ static int psmouse_extensions(struct psmouse *psmouse,
605 } 606 }
606 } 607 }
607 608
608 if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0) 609 if (max_proto > PSMOUSE_IMEX) {
609 return PSMOUSE_GENPS; 610
611 if (genius_detect(psmouse, set_properties) == 0)
612 return PSMOUSE_GENPS;
613
614 if (ps2pp_init(psmouse, set_properties) == 0)
615 return PSMOUSE_PS2PP;
610 616
611 if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0) 617 if (trackpoint_detect(psmouse, set_properties) == 0)
612 return PSMOUSE_PS2PP; 618 return PSMOUSE_TRACKPOINT;
613 619
614 if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0) 620 if (touchkit_ps2_detect(psmouse, set_properties) == 0)
615 return PSMOUSE_TRACKPOINT; 621 return PSMOUSE_TOUCHKIT_PS2;
622 }
616 623
617/* 624/*
618 * Reset to defaults in case the device got confused by extended 625 * Reset to defaults in case the device got confused by extended
@@ -713,6 +720,12 @@ static const struct psmouse_protocol psmouse_protocols[] = {
713 .detect = trackpoint_detect, 720 .detect = trackpoint_detect,
714 }, 721 },
715 { 722 {
723 .type = PSMOUSE_TOUCHKIT_PS2,
724 .name = "touchkitPS/2",
725 .alias = "touchkit",
726 .detect = touchkit_ps2_detect,
727 },
728 {
716 .type = PSMOUSE_AUTO, 729 .type = PSMOUSE_AUTO,
717 .name = "auto", 730 .name = "auto",
718 .alias = "any", 731 .alias = "any",