Browse Source

Input: wm831x-ts - ensure the controller is in a known state on open

Explicitly set all the enable bits when opening the device just in case
something left the device in an unexpected state.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Mark Brown 14 years ago
parent
commit
e7cbb90ad2
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/input/touchscreen/wm831x-ts.c

+ 3 - 1
drivers/input/touchscreen/wm831x-ts.c

@@ -167,7 +167,9 @@ static int wm831x_ts_input_open(struct input_dev *idev)
 	struct wm831x *wm831x = wm831x_ts->wm831x;
 	struct wm831x *wm831x = wm831x_ts->wm831x;
 
 
 	wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
 	wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-			WM831X_TCH_ENA, WM831X_TCH_ENA);
+			WM831X_TCH_ENA | WM831X_TCH_CVT_ENA |
+			WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+			WM831X_TCH_Z_ENA, WM831X_TCH_ENA);
 
 
 	wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
 	wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
 			WM831X_TCH_CVT_ENA, WM831X_TCH_CVT_ENA);
 			WM831X_TCH_CVT_ENA, WM831X_TCH_CVT_ENA);