These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / misc / max77693-haptic.c

diff --git a/kernel/drivers/input/misc/max77693-haptic.c b/kernel/drivers/input/misc/max77693-haptic.c
index 39e930c..6d96bff 100644 (file)
--- a/kernel/drivers/input/misc/max77693-haptic.c
+++ b/kernel/drivers/input/misc/max77693-haptic.c
@@ -1,8 +1,9 @@
 /*
- * MAXIM MAX77693 Haptic device driver
+ * MAXIM MAX77693/MAX77843 Haptic device driver
  *
- * Copyright (C) 2014 Samsung Electronics
+ * Copyright (C) 2014,2015 Samsung Electronics
  * Jaewon Kim <jaewon02.kim@samsung.com>
+ * Krzysztof Kozlowski <k.kozlowski@samsung.com>
  *
  * This program is not provided / owned by Maxim Integrated Products.
  *
@@ -24,7 +25,9 @@
 #include <linux/workqueue.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/max77693.h>
+#include <linux/mfd/max77693-common.h>
 #include <linux/mfd/max77693-private.h>
+#include <linux/mfd/max77843-private.h>
 
 #define MAX_MAGNITUDE_SHIFT    16
 
@@ -46,6 +49,8 @@ enum max77693_haptic_pwm_divisor {
 };
 
 struct max77693_haptic {
+       enum max77693_types dev_type;
+
        struct regmap *regmap_pmic;
        struct regmap *regmap_haptic;
        struct device *dev;
@@ -59,7 +64,6 @@ struct max77693_haptic {
        unsigned int pwm_duty;
        enum max77693_haptic_motor_type type;
        enum max77693_haptic_pulse_mode mode;
-       enum max77693_haptic_pwm_divisor pwm_divisor;
 
        struct work_struct work;
 };
@@ -78,19 +82,52 @@ static int max77693_haptic_set_duty_cycle(struct max77693_haptic *haptic)
        return 0;
 }
 
+static int max77843_haptic_bias(struct max77693_haptic *haptic, bool on)
+{
+       int error;
+
+       if (haptic->dev_type != TYPE_MAX77843)
+               return 0;
+
+       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 max77693_haptic_configure(struct max77693_haptic *haptic,
                                     bool enable)
 {
-       unsigned int value;
+       unsigned int value, config_reg;
        int error;
 
-       value = ((haptic->type << MAX77693_CONFIG2_MODE) |
-               (enable << MAX77693_CONFIG2_MEN) |
-               (haptic->mode << MAX77693_CONFIG2_HTYP) |
-               (haptic->pwm_divisor));
+       switch (haptic->dev_type) {
+       case TYPE_MAX77693:
+               value = ((haptic->type << MAX77693_CONFIG2_MODE) |
+                       (enable << MAX77693_CONFIG2_MEN) |
+                       (haptic->mode << MAX77693_CONFIG2_HTYP) |
+                       MAX77693_HAPTIC_PWM_DIVISOR_128);
+               config_reg = MAX77693_HAPTIC_REG_CONFIG2;
+               break;
+       case TYPE_MAX77843:
+               value = (haptic->type << MCONFIG_MODE_SHIFT) |
+                       (enable << MCONFIG_MEN_SHIFT) |
+                       MAX77693_HAPTIC_PWM_DIVISOR_128;
+               config_reg = MAX77843_HAP_REG_MCONFIG;
+               break;
+       default:
+               return -EINVAL;
+       }
 
        error = regmap_write(haptic->regmap_haptic,
-                            MAX77693_HAPTIC_REG_CONFIG2, value);
+                            config_reg, value);
        if (error) {
                dev_err(haptic->dev,
                        "failed to update haptic config: %d\n", error);
@@ -104,6 +141,9 @@ static int max77693_haptic_lowsys(struct max77693_haptic *haptic, bool enable)
 {
        int error;
 
+       if (haptic->dev_type != TYPE_MAX77693)
+               return 0;
+
        error = regmap_update_bits(haptic->regmap_pmic,
                                   MAX77693_PMIC_REG_LSCNFG,
                                   MAX77693_PMIC_LOW_SYS_MASK,
@@ -219,6 +259,10 @@ static int max77693_haptic_open(struct input_dev *dev)
        struct max77693_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,
@@ -241,6 +285,8 @@ static void max77693_haptic_close(struct input_dev *dev)
        if (error)
                dev_err(haptic->dev,
                        "failed to disable regulator: %d\n", error);
+
+       max77843_haptic_bias(haptic, false);
 }
 
 static int max77693_haptic_probe(struct platform_device *pdev)
@@ -254,13 +300,26 @@ static int max77693_haptic_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        haptic->regmap_pmic = max77693->regmap;
-       haptic->regmap_haptic = max77693->regmap_haptic;
        haptic->dev = &pdev->dev;
        haptic->type = MAX77693_HAPTIC_LRA;
        haptic->mode = MAX77693_HAPTIC_EXTERNAL_MODE;
-       haptic->pwm_divisor = MAX77693_HAPTIC_PWM_DIVISOR_128;
        haptic->suspend_state = false;
 
+       /* Variant-specific init */
+       haptic->dev_type = platform_get_device_id(pdev)->driver_data;
+       switch (haptic->dev_type) {
+       case TYPE_MAX77693:
+               haptic->regmap_haptic = max77693->regmap_haptic;
+               break;
+       case TYPE_MAX77843:
+               haptic->regmap_haptic = max77693->regmap;
+               break;
+       default:
+               dev_err(&pdev->dev, "unsupported device type: %u\n",
+                       haptic->dev_type);
+               return -EINVAL;
+       }
+
        INIT_WORK(&haptic->work, max77693_haptic_play_work);
 
        /* Get pwm and regulatot for haptic device */
@@ -338,16 +397,25 @@ static int __maybe_unused max77693_haptic_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(max77693_haptic_pm_ops,
                         max77693_haptic_suspend, max77693_haptic_resume);
 
+static const struct platform_device_id max77693_haptic_id[] = {
+       { "max77693-haptic", TYPE_MAX77693 },
+       { "max77843-haptic", TYPE_MAX77843 },
+       {},
+};
+MODULE_DEVICE_TABLE(platform, max77693_haptic_id);
+
 static struct platform_driver max77693_haptic_driver = {
        .driver         = {
                .name   = "max77693-haptic",
                .pm     = &max77693_haptic_pm_ops,
        },
        .probe          = max77693_haptic_probe,
+       .id_table       = max77693_haptic_id,
 };
 module_platform_driver(max77693_haptic_driver);
 
 MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
-MODULE_DESCRIPTION("MAXIM MAX77693 Haptic driver");
+MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>");
+MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver");
 MODULE_ALIAS("platform:max77693-haptic");
 MODULE_LICENSE("GPL");