diff options
Diffstat (limited to 'drivers/input/touchscreen')
| -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) | |||
| 168 | 64000 / rpu); | 168 | 64000 / rpu); |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | /* WM9712 five wire */ | ||
| 172 | if (five_wire) { | ||
| 173 | dig2 |= WM9712_45W; | ||
| 174 | dev_dbg(wm->dev, "setting 5-wire touchscreen mode."); | ||
| 175 | |||
| 176 | if (pil) { | ||
| 177 | dev_warn(wm->dev, "pressure measurement is not " | ||
| 178 | "supported in 5-wire mode\n"); | ||
| 179 | pil = 0; | ||
| 180 | } | ||
| 181 | } | ||
| 182 | |||
| 171 | /* touchpanel pressure current*/ | 183 | /* touchpanel pressure current*/ |
| 172 | if (pil == 2) { | 184 | if (pil == 2) { |
| 173 | dig2 |= WM9712_PIL; | 185 | dig2 |= WM9712_PIL; |
| @@ -179,12 +191,6 @@ static void wm9712_phy_init(struct wm97xx *wm) | |||
| 179 | if (!pil) | 191 | if (!pil) |
| 180 | pressure = 0; | 192 | pressure = 0; |
| 181 | 193 | ||
| 182 | /* WM9712 five wire */ | ||
| 183 | if (five_wire) { | ||
| 184 | dig2 |= WM9712_45W; | ||
| 185 | dev_dbg(wm->dev, "setting 5-wire touchscreen mode."); | ||
| 186 | } | ||
| 187 | |||
| 188 | /* polling mode sample settling delay */ | 194 | /* polling mode sample settling delay */ |
| 189 | if (delay < 0 || delay > 15) { | 195 | if (delay < 0 || delay > 15) { |
| 190 | dev_dbg(wm->dev, "supplied delay out of range."); | 196 | dev_dbg(wm->dev, "supplied delay out of range."); |
