diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-06-26 09:56:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-06-30 09:37:21 -0400 |
| commit | 8a65c02f1dfda13ac2172f88f90f087330db82de (patch) | |
| tree | f4b47cf8f5a9918b8159ad56265e090de5138712 | |
| parent | f2278f31d6feb9036eaa79f2e8abcce850420abd (diff) | |
| download | linux-stable-8a65c02f1dfda13ac2172f88f90f087330db82de.tar.gz linux-stable-8a65c02f1dfda13ac2172f88f90f087330db82de.tar.bz2 linux-stable-8a65c02f1dfda13ac2172f88f90f087330db82de.zip | |
Input: wm9712 - no pressure measurement with 5-wire mode
The hardware does not support pressure measurement is 5-wire mode
so warn the user if he tries to request it.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/touchscreen/wm9712.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c index 0b6e4cfa6a21..4c5d85a249ae 100644 --- a/drivers/input/touchscreen/wm9712.c +++ b/drivers/input/touchscreen/wm9712.c @@ -168,6 +168,18 @@ static void wm9712_phy_init(struct wm97xx *wm) 64000 / rpu); } + /* WM9712 five wire */ + if (five_wire) { + dig2 |= WM9712_45W; + dev_dbg(wm->dev, "setting 5-wire touchscreen mode."); + + if (pil) { + dev_warn(wm->dev, "pressure measurement is not " + "supported in 5-wire mode\n"); + pil = 0; + } + } + /* touchpanel pressure current*/ if (pil == 2) { dig2 |= WM9712_PIL; @@ -179,12 +191,6 @@ static void wm9712_phy_init(struct wm97xx *wm) if (!pil) pressure = 0; - /* WM9712 five wire */ - if (five_wire) { - dig2 |= WM9712_45W; - dev_dbg(wm->dev, "setting 5-wire touchscreen mode."); - } - /* polling mode sample settling delay */ if (delay < 0 || delay > 15) { dev_dbg(wm->dev, "supplied delay out of range."); |