diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /drivers/input/touchscreen/wm9713.c | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
| download | blackbird-op-linux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.gz blackbird-op-linux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.zip | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/input/touchscreen/wm9713.c')
| -rw-r--r-- | drivers/input/touchscreen/wm9713.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c index 01278bd7e65c..838458792ea0 100644 --- a/drivers/input/touchscreen/wm9713.c +++ b/drivers/input/touchscreen/wm9713.c @@ -85,6 +85,15 @@ module_param(delay, int, 0); MODULE_PARM_DESC(delay, "Set adc sample delay."); /* + * Set five_wire = 1 to use a 5 wire touchscreen. + * + * NOTE: Five wire mode does not allow for readback of pressure. + */ +static int five_wire; +module_param(five_wire, int, 0); +MODULE_PARM_DESC(five_wire, "Set to '1' to use 5-wire touchscreen."); + +/* * Set adc mask function. * * Sources of glitch noise, such as signals driving an LCD display, may feed @@ -162,6 +171,19 @@ static void wm9713_phy_init(struct wm97xx *wm) 64000 / rpu); } + /* Five wire panel? */ + if (five_wire) { + dig3 |= WM9713_45W; + dev_info(wm->dev, "setting 5-wire touchscreen mode."); + + if (pil) { + dev_warn(wm->dev, + "Pressure measurement not supported in 5 " + "wire mode, disabling\n"); + pil = 0; + } + } + /* touchpanel pressure */ if (pil == 2) { dig3 |= WM9712_PIL; |
