Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 689 insertions, 38 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6deb8dae3205..4436ab1b9735 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -115,6 +115,18 @@ config INPUT_PCSPKR
           To compile this driver as a module, choose M here: the
           module will be called pcspkr.
 
+config INPUT_PM8941_PWRKEY
+        tristate "Qualcomm PM8941 power key support"
+        depends on MFD_SPMI_PMIC
+        help
+          Say Y here if you want support for the power key usually found
+          on boards using a Qualcomm PM8941 compatible PMIC.
+
+          If unsure, say Y.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pm8941-pwrkey.
+
 config INPUT_PM8XXX_VIBRATOR
         tristate "Qualcomm PM8XXX vibrator support"
         depends on MFD_PM8XXX
@@ -165,6 +177,18 @@ config INPUT_MAX77693_HAPTIC
           To compile this driver as module, choose M here: the
           module will be called max77693-haptic.
 
+config INPUT_MAX77843_HAPTIC
+    tristate "MAXIM MAX77843 haptic controller support"
+    depends on MFD_MAX77843 && REGULATOR
+    select INPUT_FF_MEMLESS
+    help
+      This option enables support for the haptic controller on
+      MAXIM MAX77843 chip. The driver supports ff-memless interface
+      from input framework.
+
+      To compile this driver as module, choose M here: the
+      module will be called max77843-haptic.
+
 config INPUT_MAX8925_ONKEY
         tristate "MAX8925 ONKEY support"
         depends on MFD_MAX8925
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 403a1a54a76c..78ba4c1b8532 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
 obj-$(CONFIG_INPUT_MAX77693_HAPTIC)     += max77693-haptic.o
+obj-$(CONFIG_INPUT_MAX77843_HAPTIC)     += max77843-haptic.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
 obj-$(CONFIG_INPUT_MAX8997_HAPTIC)      += max8997_haptic.o
 obj-$(CONFIG_INPUT_MC13783_PWRBUTTON)   += mc13783-pwrbutton.o
@@ -49,6 +50,7 @@ obj-$(CONFIG_INPUT_PCAP)		+= pcap_keys.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)        += pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF8574)             += pcf8574_keypad.o
 obj-$(CONFIG_INPUT_PCSPKR)              += pcspkr.o
+obj-$(CONFIG_INPUT_PM8941_PWRKEY)       += pm8941-pwrkey.o
 obj-$(CONFIG_INPUT_PM8XXX_VIBRATOR)     += pm8xxx-vibrator.o
 obj-$(CONFIG_INPUT_PMIC8XXX_PWRKEY)     += pmic8xxx-pwrkey.o
 obj-$(CONFIG_INPUT_POWERMATE)           += powermate.o
diff --git a/drivers/input/misc/max77843-haptic.c b/drivers/input/misc/max77843-haptic.c
new file mode 100644
index 000000000000..dccbb465a055
--- /dev/null
+++ b/drivers/input/misc/max77843-haptic.c
@@ -0,0 +1,358 @@
+/*
+ * MAXIM MAX77693 Haptic device driver
+ *
+ * Copyright (C) 2015 Samsung Electronics
+ * Author: Jaewon Kim <jaewon02.kim@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/mfd/max77843-private.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pwm.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+
+#define MAX_MAGNITUDE_SHIFT        16
+
+enum max77843_haptic_motor_type {
+        MAX77843_HAPTIC_ERM = 0,
+        MAX77843_HAPTIC_LRA,
+};
+
+enum max77843_haptic_pwm_divisor {
+        MAX77843_HAPTIC_PWM_DIVISOR_32 = 0,
+        MAX77843_HAPTIC_PWM_DIVISOR_64,
+        MAX77843_HAPTIC_PWM_DIVISOR_128,
+        MAX77843_HAPTIC_PWM_DIVISOR_256,
+};
+
+struct max77843_haptic {
+        struct regmap *regmap_haptic;
+        struct device *dev;
+        struct input_dev *input_dev;
+        struct pwm_device *pwm_dev;
+        struct regulator *motor_reg;
+        struct work_struct work;
+        struct mutex mutex;
+
+        unsigned int magnitude;
+        unsigned int pwm_duty;
+
+        bool active;
+        bool suspended;
+
+        enum max77843_haptic_motor_type type;
+        enum max77843_haptic_pwm_divisor pwm_divisor;
+};
+
+static int max77843_haptic_set_duty_cycle(struct max77843_haptic *haptic)
+{
+        int delta = (haptic->pwm_dev->period + haptic->pwm_duty) / 2;
+        int error;
+
+        error = pwm_config(haptic->pwm_dev, delta, haptic->pwm_dev->period);
+        if (error) {
+                dev_err(haptic->dev, "failed to configure pwm: %d\n", error);
+                return error;
+        }
+
+        return 0;
+}
+
+static int max77843_haptic_bias(struct max77843_haptic *haptic, bool on)
+{
+        int error;
+
+        error = regmap_update_bits(haptic->regmap_haptic,
+                                   MAX77843_SYS_REG_MAINCTRL1,
+                                   MAX77843_MAINCTRL1_BIASEN_MASK,
+                                   on << MAINCTRL1_BIASEN_SHIFT);
+        if (error) {
+                dev_err(haptic->dev, "failed to %s bias: %d\n",
+                        on ? "enable" : "disable", error);
+                return error;
+        }
+
+        return 0;
+}
+
+static int max77843_haptic_config(struct max77843_haptic *haptic, bool enable)
+{
+        unsigned int value;
+        int error;
+
+        value = (haptic->type << MCONFIG_MODE_SHIFT) |
+                (enable << MCONFIG_MEN_SHIFT) |
+                (haptic->pwm_divisor << MCONFIG_PDIV_SHIFT);
+
+        error = regmap_write(haptic->regmap_haptic,
+                             MAX77843_HAP_REG_MCONFIG, value);
+        if (error) {
+                dev_err(haptic->dev,
+                        "failed to update haptic config: %d\n", error);
+                return error;
+        }
+
+        return 0;
+}
+
+static int max77843_haptic_enable(struct max77843_haptic *haptic)
+{
+        int error;
+
+        if (haptic->active)
+                return 0;
+
+        error = pwm_enable(haptic->pwm_dev);
+        if (error) {
+                dev_err(haptic->dev,
+                        "failed to enable pwm device: %d\n", error);
+                return error;
+        }
+
+        error = max77843_haptic_config(haptic, true);
+        if (error)
+                goto err_config;
+
+        haptic->active = true;
+
+        return 0;
+
+err_config:
+        pwm_disable(haptic->pwm_dev);
+
+        return error;
+}
+
+static int max77843_haptic_disable(struct max77843_haptic *haptic)
+{
+        int error;
+
+        if (!haptic->active)
+                return 0;
+
+        error = max77843_haptic_config(haptic, false);
+        if (error)
+                return error;
+
+        pwm_disable(haptic->pwm_dev);
+
+        haptic->active = false;
+
+        return 0;
+}
+
+static void max77843_haptic_play_work(struct work_struct *work)
+{
+        struct max77843_haptic *haptic =
+                        container_of(work, struct max77843_haptic, work);
+        int error;
+
+        mutex_lock(&haptic->mutex);
+
+        if (haptic->suspended)
+                goto out_unlock;
+
+        if (haptic->magnitude) {
+                error = max77843_haptic_set_duty_cycle(haptic);
+                if (error) {
+                        dev_err(haptic->dev,
+                                "failed to set duty cycle: %d\n", error);
+                        goto out_unlock;
+                }
+
+                error = max77843_haptic_enable(haptic);
+                if (error)
+                        dev_err(haptic->dev,
+                                "cannot enable haptic: %d\n", error);
+        } else {
+                error = max77843_haptic_disable(haptic);
+                if (error)
+                        dev_err(haptic->dev,
+                                "cannot disable haptic: %d\n", error);
+        }
+
+out_unlock:
+        mutex_unlock(&haptic->mutex);
+}
+
+static int max77843_haptic_play_effect(struct input_dev *dev, void *data,
+                struct ff_effect *effect)
+{
+        struct max77843_haptic *haptic = input_get_drvdata(dev);
+        u64 period_mag_multi;
+
+        haptic->magnitude = effect->u.rumble.strong_magnitude;
+        if (!haptic->magnitude)
+                haptic->magnitude = effect->u.rumble.weak_magnitude;
+
+        period_mag_multi = (u64)haptic->pwm_dev->period * haptic->magnitude;
+        haptic->pwm_duty = (unsigned int)(period_mag_multi >>
+                                                MAX_MAGNITUDE_SHIFT);
+
+        schedule_work(&haptic->work);
+
+        return 0;
+}
+
+static int max77843_haptic_open(struct input_dev *dev)
+{
+        struct max77843_haptic *haptic = input_get_drvdata(dev);
+        int error;
+
+        error = max77843_haptic_bias(haptic, true);
+        if (error)
+                return error;
+
+        error = regulator_enable(haptic->motor_reg);
+        if (error) {
+                dev_err(haptic->dev,
+                        "failed to enable regulator: %d\n", error);
+                return error;
+        }
+
+        return 0;
+}
+
+static void max77843_haptic_close(struct input_dev *dev)
+{
+        struct max77843_haptic *haptic = input_get_drvdata(dev);
+        int error;
+
+        cancel_work_sync(&haptic->work);
+        max77843_haptic_disable(haptic);
+
+        error = regulator_disable(haptic->motor_reg);
+        if (error)
+                dev_err(haptic->dev,
+                        "failed to disable regulator: %d\n", error);
+
+        max77843_haptic_bias(haptic, false);
+}
+
+static int max77843_haptic_probe(struct platform_device *pdev)
+{
+        struct max77843 *max77843 = dev_get_drvdata(pdev->dev.parent);
+        struct max77843_haptic *haptic;
+        int error;
+
+        haptic = devm_kzalloc(&pdev->dev, sizeof(*haptic), GFP_KERNEL);
+        if (!haptic)
+                return -ENOMEM;
+
+        haptic->regmap_haptic = max77843->regmap;
+        haptic->dev = &pdev->dev;
+        haptic->type = MAX77843_HAPTIC_LRA;
+        haptic->pwm_divisor = MAX77843_HAPTIC_PWM_DIVISOR_128;
+
+        INIT_WORK(&haptic->work, max77843_haptic_play_work);
+        mutex_init(&haptic->mutex);
+
+        haptic->pwm_dev = devm_pwm_get(&pdev->dev, NULL);
+        if (IS_ERR(haptic->pwm_dev)) {
+                dev_err(&pdev->dev, "failed to get pwm device\n");
+                return PTR_ERR(haptic->pwm_dev);
+        }
+
+        haptic->motor_reg = devm_regulator_get_exclusive(&pdev->dev, "haptic");
+        if (IS_ERR(haptic->motor_reg)) {
+                dev_err(&pdev->dev, "failed to get regulator\n");
+                return PTR_ERR(haptic->motor_reg);
+        }
+
+        haptic->input_dev = devm_input_allocate_device(&pdev->dev);
+        if (!haptic->input_dev) {
+                dev_err(&pdev->dev, "failed to allocate input device\n");
+                return -ENOMEM;
+        }
+
+        haptic->input_dev->name = "max77843-haptic";
+        haptic->input_dev->id.version = 1;
+        haptic->input_dev->dev.parent = &pdev->dev;
+        haptic->input_dev->open = max77843_haptic_open;
+        haptic->input_dev->close = max77843_haptic_close;
+        input_set_drvdata(haptic->input_dev, haptic);
+        input_set_capability(haptic->input_dev, EV_FF, FF_RUMBLE);
+
+        error = input_ff_create_memless(haptic->input_dev, NULL,
+                        max77843_haptic_play_effect);
+        if (error) {
+                dev_err(&pdev->dev, "failed to create force-feedback\n");
+                return error;
+        }
+
+        error = input_register_device(haptic->input_dev);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register input device\n");
+                return error;
+        }
+
+        platform_set_drvdata(pdev, haptic);
+
+        return 0;
+}
+
+static int __maybe_unused max77843_haptic_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct max77843_haptic *haptic = platform_get_drvdata(pdev);
+        int error;
+
+        error = mutex_lock_interruptible(&haptic->mutex);
+        if (error)
+                return error;
+
+        max77843_haptic_disable(haptic);
+
+        haptic->suspended = true;
+
+        mutex_unlock(&haptic->mutex);
+
+        return 0;
+}
+
+static int __maybe_unused max77843_haptic_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct max77843_haptic *haptic = platform_get_drvdata(pdev);
+        unsigned int magnitude;
+
+        mutex_lock(&haptic->mutex);
+
+        haptic->suspended = false;
+
+        magnitude = ACCESS_ONCE(haptic->magnitude);
+        if (magnitude)
+                max77843_haptic_enable(haptic);
+
+        mutex_unlock(&haptic->mutex);
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(max77843_haptic_pm_ops,
+                max77843_haptic_suspend, max77843_haptic_resume);
+
+static struct platform_driver max77843_haptic_driver = {
+        .driver         = {
+                .name   = "max77843-haptic",
+                .pm     = &max77843_haptic_pm_ops,
+        },
+        .probe          = max77843_haptic_probe,
+};
+module_platform_driver(max77843_haptic_driver);
+
+MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
+MODULE_DESCRIPTION("MAXIM MAX77843 Haptic driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index 98228773a111..19c73574458e 100644
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -174,12 +174,13 @@ static int mma8450_probe(struct i2c_client *c,
         struct mma8450 *m;
         int err;
 
-        m = kzalloc(sizeof(struct mma8450), GFP_KERNEL);
-        idev = input_allocate_polled_device();
-        if (!m || !idev) {
-                err = -ENOMEM;
-                goto err_free_mem;
-        }
+        m = devm_kzalloc(&c->dev, sizeof(*m), GFP_KERNEL);
+        if (!m)
+                return -ENOMEM;
+
+        idev = devm_input_allocate_polled_device(&c->dev);
+        if (!idev)
+                return -ENOMEM;
 
         m->client = c;
         m->idev = idev;
@@ -187,7 +188,6 @@ static int mma8450_probe(struct i2c_client *c,
         idev->private           = m;
         idev->input->name       = MMA8450_DRV_NAME;
         idev->input->id.bustype = BUS_I2C;
-        idev->input->dev.parent = &c->dev;
         idev->poll              = mma8450_poll;
         idev->poll_interval     = POLL_INTERVAL;
         idev->poll_interval_max = POLL_INTERVAL_MAX;
@@ -202,29 +202,12 @@ static int mma8450_probe(struct i2c_client *c,
         err = input_register_polled_device(idev);
         if (err) {
                 dev_err(&c->dev, "failed to register polled input device\n");
-                goto err_free_mem;
+                return err;
         }
 
         i2c_set_clientdata(c, m);
 
         return 0;
-
-err_free_mem:
-        input_free_polled_device(idev);
-        kfree(m);
-        return err;
-}
-
-static int mma8450_remove(struct i2c_client *c)
-{
-        struct mma8450 *m = i2c_get_clientdata(c);
-        struct input_polled_dev *idev = m->idev;
-
-        input_unregister_polled_device(idev);
-        input_free_polled_device(idev);
-        kfree(m);
-
-        return 0;
 }
 
 static const struct i2c_device_id mma8450_id[] = {
@@ -242,11 +225,9 @@ MODULE_DEVICE_TABLE(of, mma8450_dt_ids);
 static struct i2c_driver mma8450_driver = {
         .driver = {
                 .name   = MMA8450_DRV_NAME,
-                .owner  = THIS_MODULE,
                 .of_match_table = mma8450_dt_ids,
         },
         .probe          = mma8450_probe,
-        .remove         = mma8450_remove,
         .id_table       = mma8450_id,
 };
 
diff --git a/drivers/input/misc/palmas-pwrbutton.c b/drivers/input/misc/palmas-pwrbutton.c
index 1f9b5ee92746..1e1baed63929 100644
--- a/drivers/input/misc/palmas-pwrbutton.c
+++ b/drivers/input/misc/palmas-pwrbutton.c
@@ -304,7 +304,7 @@ static SIMPLE_DEV_PM_OPS(palmas_pwron_pm,
                          palmas_pwron_suspend, palmas_pwron_resume);
 
 #ifdef CONFIG_OF
-static struct of_device_id of_palmas_pwr_match[] = {
+static const struct of_device_id of_palmas_pwr_match[] = {
         { .compatible = "ti,palmas-pwrbutton" },
         { },
 };
diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
new file mode 100644
index 000000000000..867db8a91372
--- /dev/null
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2014, Sony Mobile Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/reboot.h>
+#include <linux/regmap.h>
+
+#define PON_REV2                        0x01
+
+#define PON_RT_STS                      0x10
+#define  PON_KPDPWR_N_SET               BIT(0)
+
+#define PON_PS_HOLD_RST_CTL             0x5a
+#define PON_PS_HOLD_RST_CTL2            0x5b
+#define  PON_PS_HOLD_ENABLE             BIT(7)
+#define  PON_PS_HOLD_TYPE_MASK          0x0f
+#define  PON_PS_HOLD_TYPE_SHUTDOWN      4
+#define  PON_PS_HOLD_TYPE_HARD_RESET    7
+
+#define PON_PULL_CTL                    0x70
+#define  PON_KPDPWR_PULL_UP             BIT(1)
+
+#define PON_DBC_CTL                     0x71
+#define  PON_DBC_DELAY_MASK             0x7
+
+
+struct pm8941_pwrkey {
+        struct device *dev;
+        int irq;
+        u32 baseaddr;
+        struct regmap *regmap;
+        struct input_dev *input;
+
+        unsigned int revision;
+        struct notifier_block reboot_notifier;
+};
+
+static int pm8941_reboot_notify(struct notifier_block *nb,
+                                unsigned long code, void *unused)
+{
+        struct pm8941_pwrkey *pwrkey = container_of(nb, struct pm8941_pwrkey,
+                                                    reboot_notifier);
+        unsigned int enable_reg;
+        unsigned int reset_type;
+        int error;
+
+        /* PMICs with revision 0 have the enable bit in same register as ctrl */
+        if (pwrkey->revision == 0)
+                enable_reg = PON_PS_HOLD_RST_CTL;
+        else
+                enable_reg = PON_PS_HOLD_RST_CTL2;
+
+        error = regmap_update_bits(pwrkey->regmap,
+                                   pwrkey->baseaddr + enable_reg,
+                                   PON_PS_HOLD_ENABLE,
+                                   0);
+        if (error)
+                dev_err(pwrkey->dev,
+                        "unable to clear ps hold reset enable: %d\n",
+                        error);
+
+        /*
+         * Updates of PON_PS_HOLD_ENABLE requires 3 sleep cycles between
+         * writes.
+         */
+        usleep_range(100, 1000);
+
+        switch (code) {
+        case SYS_HALT:
+        case SYS_POWER_OFF:
+                reset_type = PON_PS_HOLD_TYPE_SHUTDOWN;
+                break;
+        case SYS_RESTART:
+        default:
+                reset_type = PON_PS_HOLD_TYPE_HARD_RESET;
+                break;
+        };
+
+        error = regmap_update_bits(pwrkey->regmap,
+                                   pwrkey->baseaddr + PON_PS_HOLD_RST_CTL,
+                                   PON_PS_HOLD_TYPE_MASK,
+                                   reset_type);
+        if (error)
+                dev_err(pwrkey->dev, "unable to set ps hold reset type: %d\n",
+                        error);
+
+        error = regmap_update_bits(pwrkey->regmap,
+                                   pwrkey->baseaddr + enable_reg,
+                                   PON_PS_HOLD_ENABLE,
+                                   PON_PS_HOLD_ENABLE);
+        if (error)
+                dev_err(pwrkey->dev, "unable to re-set enable: %d\n", error);
+
+        return NOTIFY_DONE;
+}
+
+static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data)
+{
+        struct pm8941_pwrkey *pwrkey = _data;
+        unsigned int sts;
+        int error;
+
+        error = regmap_read(pwrkey->regmap,
+                            pwrkey->baseaddr + PON_RT_STS, &sts);
+        if (error)
+                return IRQ_HANDLED;
+
+        input_report_key(pwrkey->input, KEY_POWER, !!(sts & PON_KPDPWR_N_SET));
+        input_sync(pwrkey->input);
+
+        return IRQ_HANDLED;
+}
+
+static int __maybe_unused pm8941_pwrkey_suspend(struct device *dev)
+{
+        struct pm8941_pwrkey *pwrkey = dev_get_drvdata(dev);
+
+        if (device_may_wakeup(dev))
+                enable_irq_wake(pwrkey->irq);
+
+        return 0;
+}
+
+static int __maybe_unused pm8941_pwrkey_resume(struct device *dev)
+{
+        struct pm8941_pwrkey *pwrkey = dev_get_drvdata(dev);
+
+        if (device_may_wakeup(dev))
+                disable_irq_wake(pwrkey->irq);
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(pm8941_pwr_key_pm_ops,
+                         pm8941_pwrkey_suspend, pm8941_pwrkey_resume);
+
+static int pm8941_pwrkey_probe(struct platform_device *pdev)
+{
+        struct pm8941_pwrkey *pwrkey;
+        bool pull_up;
+        u32 req_delay;
+        int error;
+
+        if (of_property_read_u32(pdev->dev.of_node, "debounce", &req_delay))
+                req_delay = 15625;
+
+        if (req_delay > 2000000 || req_delay == 0) {
+                dev_err(&pdev->dev, "invalid debounce time: %u\n", req_delay);
+                return -EINVAL;
+        }
+
+        pull_up = of_property_read_bool(pdev->dev.of_node, "bias-pull-up");
+
+        pwrkey = devm_kzalloc(&pdev->dev, sizeof(*pwrkey), GFP_KERNEL);
+        if (!pwrkey)
+                return -ENOMEM;
+
+        pwrkey->dev = &pdev->dev;
+
+        pwrkey->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+        if (!pwrkey->regmap) {
+                dev_err(&pdev->dev, "failed to locate regmap\n");
+                return -ENODEV;
+        }
+
+        pwrkey->irq = platform_get_irq(pdev, 0);
+        if (pwrkey->irq < 0) {
+                dev_err(&pdev->dev, "failed to get irq\n");
+                return pwrkey->irq;
+        }
+
+        error = of_property_read_u32(pdev->dev.of_node, "reg",
+                                     &pwrkey->baseaddr);
+        if (error)
+                return error;
+
+        error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2,
+                            &pwrkey->revision);
+        if (error) {
+                dev_err(&pdev->dev, "failed to set debounce: %d\n", error);
+                return error;
+        }
+
+        pwrkey->input = devm_input_allocate_device(&pdev->dev);
+        if (!pwrkey->input) {
+                dev_dbg(&pdev->dev, "unable to allocate input device\n");
+                return -ENOMEM;
+        }
+
+        input_set_capability(pwrkey->input, EV_KEY, KEY_POWER);
+
+        pwrkey->input->name = "pm8941_pwrkey";
+        pwrkey->input->phys = "pm8941_pwrkey/input0";
+
+        req_delay = (req_delay << 6) / USEC_PER_SEC;
+        req_delay = ilog2(req_delay);
+
+        error = regmap_update_bits(pwrkey->regmap,
+                                   pwrkey->baseaddr + PON_DBC_CTL,
+                                   PON_DBC_DELAY_MASK,
+                                   req_delay);
+        if (error) {
+                dev_err(&pdev->dev, "failed to set debounce: %d\n", error);
+                return error;
+        }
+
+        error = regmap_update_bits(pwrkey->regmap,
+                                   pwrkey->baseaddr + PON_PULL_CTL,
+                                   PON_KPDPWR_PULL_UP,
+                                   pull_up ? PON_KPDPWR_PULL_UP : 0);
+        if (error) {
+                dev_err(&pdev->dev, "failed to set pull: %d\n", error);
+                return error;
+        }
+
+        error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq,
+                                          NULL, pm8941_pwrkey_irq,
+                                          IRQF_ONESHOT,
+                                          "pm8941_pwrkey", pwrkey);
+        if (error) {
+                dev_err(&pdev->dev, "failed requesting IRQ: %d\n", error);
+                return error;
+        }
+
+        error = input_register_device(pwrkey->input);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register input device: %d\n",
+                        error);
+                return error;
+        }
+
+        pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify,
+        error = register_reboot_notifier(&pwrkey->reboot_notifier);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register reboot notifier: %d\n",
+                        error);
+                return error;
+        }
+
+        platform_set_drvdata(pdev, pwrkey);
+        device_init_wakeup(&pdev->dev, 1);
+
+        return 0;
+}
+
+static int pm8941_pwrkey_remove(struct platform_device *pdev)
+{
+        struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev);
+
+        device_init_wakeup(&pdev->dev, 0);
+        unregister_reboot_notifier(&pwrkey->reboot_notifier);
+
+        return 0;
+}
+
+static const struct of_device_id pm8941_pwr_key_id_table[] = {
+        { .compatible = "qcom,pm8941-pwrkey" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);
+
+static struct platform_driver pm8941_pwrkey_driver = {
+        .probe = pm8941_pwrkey_probe,
+        .remove = pm8941_pwrkey_remove,
+        .driver = {
+                .name = "pm8941-pwrkey",
+                .pm = &pm8941_pwr_key_pm_ops,
+                .of_match_table = of_match_ptr(pm8941_pwr_key_id_table),
+        },
+};
+module_platform_driver(pm8941_pwrkey_driver);
+
+MODULE_DESCRIPTION("PM8941 Power Key driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index a28ee70ff158..e82edf810d1f 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -50,7 +50,6 @@ static int pwm_beeper_event(struct input_dev *input,
         }
 
         if (value == 0) {
-                pwm_config(beeper->pwm, 0, 0);
                 pwm_disable(beeper->pwm);
         } else {
                 period = HZ_TO_NANOSECONDS(value);
@@ -169,12 +168,6 @@ static int __maybe_unused pwm_beeper_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pwm_beeper_pm_ops,
                          pwm_beeper_suspend, pwm_beeper_resume);
 
-#ifdef CONFIG_PM_SLEEP
-#define PWM_BEEPER_PM_OPS (&pwm_beeper_pm_ops)
-#else
-#define PWM_BEEPER_PM_OPS NULL
-#endif
-
 #ifdef CONFIG_OF
 static const struct of_device_id pwm_beeper_match[] = {
         { .compatible = "pwm-beeper", },
@@ -187,7 +180,7 @@ static struct platform_driver pwm_beeper_driver = {
         .remove = pwm_beeper_remove,
         .driver = {
                 .name   = "pwm-beeper",
-                .pm     = PWM_BEEPER_PM_OPS,
+                .pm     = &pwm_beeper_pm_ops,
                 .of_match_table = of_match_ptr(pwm_beeper_match),
         },
 };
diff --git a/drivers/input/misc/regulator-haptic.c b/drivers/input/misc/regulator-haptic.c
index 132eb914ea3e..6bf3f1082f71 100644
--- a/drivers/input/misc/regulator-haptic.c
+++ b/drivers/input/misc/regulator-haptic.c
@@ -245,7 +245,7 @@ static int __maybe_unused regulator_haptic_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(regulator_haptic_pm_ops,
                 regulator_haptic_suspend, regulator_haptic_resume);
 
-static struct of_device_id regulator_haptic_dt_match[] = {
+static const struct of_device_id regulator_haptic_dt_match[] = {
         { .compatible = "regulator-haptic" },
         { /* sentinel */ },
 };
diff --git a/drivers/input/misc/tps65218-pwrbutton.c b/drivers/input/misc/tps65218-pwrbutton.c
index 54508dec4eb3..a39b62651a4b 100644
--- a/drivers/input/misc/tps65218-pwrbutton.c
+++ b/drivers/input/misc/tps65218-pwrbutton.c
@@ -106,7 +106,7 @@ static int tps65218_pwron_probe(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id of_tps65218_pwr_match[] = {
+static const struct of_device_id of_tps65218_pwr_match[] = {
         { .compatible = "ti,tps65218-pwrbutton" },
         { },
 };