Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104206
b: refs/heads/master
c: 8a65c02
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Dmitry Torokhov committed Jun 30, 2008
1 parent b518f2d commit b8dc57f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2278f31d6feb9036eaa79f2e8abcce850420abd
refs/heads/master: 8a65c02f1dfda13ac2172f88f90f087330db82de
18 changes: 12 additions & 6 deletions trunk/drivers/input/touchscreen/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.");
Expand Down

0 comments on commit b8dc57f

Please sign in to comment.