|
@@ -168,6 +168,18 @@ static void wm9712_phy_init(struct wm97xx *wm)
|
|
64000 / rpu);
|
|
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*/
|
|
/* touchpanel pressure current*/
|
|
if (pil == 2) {
|
|
if (pil == 2) {
|
|
dig2 |= WM9712_PIL;
|
|
dig2 |= WM9712_PIL;
|
|
@@ -179,12 +191,6 @@ static void wm9712_phy_init(struct wm97xx *wm)
|
|
if (!pil)
|
|
if (!pil)
|
|
pressure = 0;
|
|
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 */
|
|
/* polling mode sample settling delay */
|
|
if (delay < 0 || delay > 15) {
|
|
if (delay < 0 || delay > 15) {
|
|
dev_dbg(wm->dev, "supplied delay out of range.");
|
|
dev_dbg(wm->dev, "supplied delay out of range.");
|