[PATCH] WM9712: Warn if user attempts to use pressure measurement with 5 wire mode
DORMANTno replies
From: Mark Brown <hidden>
Date: 2008-06-24 11:57:15
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest, wolfson microelectronics drivers · Maintainers:
Dmitry Torokhov, Linus Torvalds
This is not supported by the hardware. Signed-off-by: Mark Brown <redacted> --- 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 0b6e4cf..4c5d85a 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.");
--
1.5.3.2