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: (75 commits)
  Input: wacom - specify Cinitq supported tools
  Input: ab8500-ponkey - fix IRQ freeing in error path
  Input: adp5588-keys - use more obvious i2c_device_id name string
  Input: ad7877 - switch to using threaded IRQ
  Input: ad7877 - use attribute group to control visibility of attributes
  Input: serio - add support for PS2Mult multiplexer protocol
  Input: wacom - properly enable runtime PM
  Input: ad7877 - filter events where pressure is beyond the maximum
  Input: ad7877 - implement EV_KEY:BTN_TOUCH reporting
  Input: ad7877 - implement specified chip select behavior
  Input: hp680_ts_input - use cancel_delayed_work_sync()
  Input: mousedev - correct lockdep annotation
  Input: ads7846 - switch to using threaded IRQ
  Input: serio - support multiple child devices per single parent
  Input: synaptics - simplify pass-through port handling
  Input: add ROHM BU21013 touch panel controller support
  Input: omap4-keypad - wake-up on events & long presses
  Input: omap4-keypad - fix interrupt line configuration
  Input: omap4-keypad - SYSCONFIG register configuration
  Input: omap4-keypad - use platform device helpers
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index defa786dee34..b8c4b80e4c43 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -338,6 +338,21 @@ static struct resource ab8500_rtc_resources[] = {
         },
 };
 
+static struct resource ab8500_poweronkey_db_resources[] = {
+        {
+                .name   = "ONKEY_DBF",
+                .start  = AB8500_INT_PON_KEY1DB_F,
+                .end    = AB8500_INT_PON_KEY1DB_F,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .name   = "ONKEY_DBR",
+                .start  = AB8500_INT_PON_KEY1DB_R,
+                .end    = AB8500_INT_PON_KEY1DB_R,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
 static struct mfd_cell ab8500_devs[] = {
         {
                 .name = "ab8500-gpadc",
@@ -354,6 +369,11 @@ static struct mfd_cell ab8500_devs[] = {
         { .name = "ab8500-usb", },
         { .name = "ab8500-pwm", },
         { .name = "ab8500-regulator", },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
 };
 
 int __devinit ab8500_init(struct ab8500 *ab8500)