Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: wm831x-ts - move BTN_TOUCH reporting to data transfer
  Input: wm831x-ts - allow IRQ flags to be specified
  Input: wm831x-ts - fix races with IRQ management

diff --combined include/linux/mfd/wm831x/pdata.h
index afe4db4,6b0eb13..632d156
--- 1/include/linux/mfd/wm831x/pdata.h
--- 2/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
@@@ -81,7 -81,9 +81,9 @@@ struct wm831x_touch_pdata 
        int rpu;               /** Pen down sensitivity resistor divider */
        int pressure;          /** Report pressure (boolean) */
        unsigned int data_irq; /** Touch data ready IRQ */
+       int data_irqf;         /** IRQ flags for data ready IRQ */
        unsigned int pd_irq;   /** Touch pendown detect IRQ */
+       int pd_irqf;           /** IRQ flags for pen down IRQ */
  };
  
  enum wm831x_watchdog_action {
@@@ -104,17 -106,11 +106,17 @@@ struct wm831x_watchdog_pdata 
  #define WM831X_MAX_ISINK  2
  
  struct wm831x_pdata {
 +      /** Used to distinguish multiple WM831x chips */
 +      int wm831x_num;
 +
        /** Called before subdevices are set up */
        int (*pre_init)(struct wm831x *wm831x);
        /** Called after subdevices are set up */
        int (*post_init)(struct wm831x *wm831x);
  
 +      /** Put the /IRQ line into CMOS mode */
 +      bool irq_cmos;
 +
        int irq_base;
        int gpio_base;
        struct wm831x_backlight_pdata *backlight;