Input: pm8xxx-vib - parametrize the driver

In order to prepare this driver to support other vibrators of the same
kind, move some hardcoded values to a structure holding register
parameters (address, mask, shit of the control register).

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c
index 5804481703420f6d38336a76ff412b0445a1bb50..cf94fa3f5f2eb2cdf266cfa7ee42f4120259a8c1 100644 (file)
--- a/drivers/input/misc/pm8xxx-vibrator.c
+++ b/drivers/input/misc/pm8xxx-vibrator.c
@@ -14,36 +14,47 @@
 #include <linux/input.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
-#define VIB_DRV                        0x4A
-
-#define VIB_DRV_SEL_MASK       0xf8
-#define VIB_DRV_SEL_SHIFT      0x03
-#define VIB_DRV_EN_MANUAL_MASK 0xfc
-
 #define VIB_MAX_LEVEL_mV       (3100)
 #define VIB_MIN_LEVEL_mV       (1200)
 #define VIB_MAX_LEVELS         (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV)
 
 #define MAX_FF_SPEED           0xff
 
+struct pm8xxx_regs {
+       unsigned int drv_addr;
+       unsigned int drv_mask;
+       unsigned int drv_shift;
+       unsigned int drv_en_manual_mask;
+};
+
+static const struct pm8xxx_regs pm8058_regs = {
+       .drv_addr = 0x4A,
+       .drv_mask = 0xf8,
+       .drv_shift = 3,
+       .drv_en_manual_mask = 0xfc,
+};
+
 /**
  * struct pm8xxx_vib - structure to hold vibrator data
  * @vib_input_dev: input device supporting force feedback
  * @work: work structure to set the vibration parameters
  * @regmap: regmap for register read/write
+ * @regs: registers' info
  * @speed: speed of vibration set from userland
  * @active: state of vibrator
  * @level: level of vibration to set in the chip
- * @reg_vib_drv: VIB_DRV register value
+ * @reg_vib_drv: regs->drv_addr register value
  */
 struct pm8xxx_vib {
        struct input_dev *vib_input_dev;
        struct work_struct work;
        struct regmap *regmap;
+       const struct pm8xxx_regs *regs;
        int speed;
        int level;
        bool active;
@@ -59,13 +70,14 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
 {
        int rc;
        unsigned int val = vib->reg_vib_drv;
+       const struct pm8xxx_regs *regs = vib->regs;
 
        if (on)
-               val |= ((vib->level << VIB_DRV_SEL_SHIFT) & VIB_DRV_SEL_MASK);
+               val |= (vib->level << regs->drv_shift) & regs->drv_mask;
        else
-               val &= ~VIB_DRV_SEL_MASK;
+               val &= ~regs->drv_mask;
 
-       rc = regmap_write(vib->regmap, VIB_DRV, val);
+       rc = regmap_write(vib->regmap, regs->drv_addr, val);
        if (rc < 0)
                return rc;
 
@@ -80,10 +92,11 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
 static void pm8xxx_work_handler(struct work_struct *work)
 {
        struct pm8xxx_vib *vib = container_of(work, struct pm8xxx_vib, work);
+       const struct pm8xxx_regs *regs = vib->regs;
        int rc;
        unsigned int val;
 
-       rc = regmap_read(vib->regmap, VIB_DRV, &val);
+       rc = regmap_read(vib->regmap, regs->drv_addr, &val);
        if (rc < 0)
                return;
 
@@ -147,6 +160,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev)
        struct input_dev *input_dev;
        int error;
        unsigned int val;
+       const struct pm8xxx_regs *regs;
 
        vib = devm_kzalloc(&pdev->dev, sizeof(*vib), GFP_KERNEL);
        if (!vib)
@@ -163,16 +177,19 @@ static int pm8xxx_vib_probe(struct platform_device *pdev)
        INIT_WORK(&vib->work, pm8xxx_work_handler);
        vib->vib_input_dev = input_dev;
 
+       regs = of_device_get_match_data(&pdev->dev);
+
        /* operate in manual mode */
-       error = regmap_read(vib->regmap, VIB_DRV, &val);
+       error = regmap_read(vib->regmap, regs->drv_addr, &val);
        if (error < 0)
                return error;
 
-       val &= ~VIB_DRV_EN_MANUAL_MASK;
-       error = regmap_write(vib->regmap, VIB_DRV, val);
+       val &= regs->drv_en_manual_mask;
+       error = regmap_write(vib->regmap, regs->drv_addr, val);
        if (error < 0)
                return error;
 
+       vib->regs = regs;
        vib->reg_vib_drv = val;
 
        input_dev->name = "pm8xxx_vib_ffmemless";
@@ -212,8 +229,8 @@ static int __maybe_unused pm8xxx_vib_suspend(struct device *dev)
 static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL);
 
 static const struct of_device_id pm8xxx_vib_id_table[] = {
-       { .compatible = "qcom,pm8058-vib" },
-       { .compatible = "qcom,pm8921-vib" },
+       { .compatible = "qcom,pm8058-vib", .data = &pm8058_regs },
+       { .compatible = "qcom,pm8921-vib", .data = &pm8058_regs },
        { }
 };
 MODULE_DEVICE_TABLE(of, pm8xxx_vib_id_table);