input: pm8xxx-vibrator: add new SPMI vibrator support

Add support for a new SPMI vibrator module which is very similar
to the vibrator module inside PM8916 but has a finer drive voltage
step and different output voltage range, its drive level control
is expanded across 2 registers. The vibrator module can be found
in following Qualcomm PMICs: PMI632, PM7250B, PM7325B, PM7550BA.

Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240416-pm8xxx-vibrator-new-design-v11-3-7b1c951e1515@quicinc.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 2bcfa7ed3d6b79e3bbc89c2fa65bc1ae355750c4..381b064732791faa49cd90a3395b9f8a10a1f4c2 100644 (file)
--- a/drivers/input/misc/pm8xxx-vibrator.c
+++ b/drivers/input/misc/pm8xxx-vibrator.c
@@ -11,10 +11,11 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
-#define VIB_MAX_LEVEL_mV       (3100)
-#define VIB_MIN_LEVEL_mV       (1200)
-#define VIB_PER_STEP_mV                (100)
-#define VIB_MAX_LEVELS         (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV + VIB_PER_STEP_mV)
+#define VIB_MAX_LEVEL_mV(vib)  (vib->drv2_addr ? 3544 : 3100)
+#define VIB_MIN_LEVEL_mV(vib)  (vib->drv2_addr ? 1504 : 1200)
+#define VIB_PER_STEP_mV(vib)   (vib->drv2_addr ? 8 : 100)
+#define VIB_MAX_LEVELS(vib) \
+       (VIB_MAX_LEVEL_mV(vib) - VIB_MIN_LEVEL_mV(vib) + VIB_PER_STEP_mV(vib))
 
 #define MAX_FF_SPEED           0xff
 
@@ -25,7 +26,11 @@ struct pm8xxx_regs {
        unsigned int drv_offset;
        unsigned int drv_mask;
        unsigned int drv_shift;
+       unsigned int drv2_offset;
+       unsigned int drv2_mask;
+       unsigned int drv2_shift;
        unsigned int drv_en_manual_mask;
+       bool         drv_in_step;
 };
 
 static const struct pm8xxx_regs pm8058_regs = {
@@ -33,6 +38,7 @@ static const struct pm8xxx_regs pm8058_regs = {
        .drv_mask = GENMASK(7, 3),
        .drv_shift = 3,
        .drv_en_manual_mask = 0xfc,
+       .drv_in_step = true,
 };
 
 static struct pm8xxx_regs pm8916_regs = {
@@ -42,6 +48,20 @@ static struct pm8xxx_regs pm8916_regs = {
        .drv_mask = GENMASK(4, 0),
        .drv_shift = 0,
        .drv_en_manual_mask = 0,
+       .drv_in_step = true,
+};
+
+static struct pm8xxx_regs pmi632_regs = {
+       .enable_offset = 0x46,
+       .enable_mask = BIT(7),
+       .drv_offset = 0x40,
+       .drv_mask = GENMASK(7, 0),
+       .drv_shift = 0,
+       .drv2_offset = 0x41,
+       .drv2_mask = GENMASK(3, 0),
+       .drv2_shift = 8,
+       .drv_en_manual_mask = 0,
+       .drv_in_step = false,
 };
 
 /**
@@ -52,6 +72,7 @@ static struct pm8xxx_regs pm8916_regs = {
  * @regs: registers' info
  * @enable_addr: vibrator enable register
  * @drv_addr: vibrator drive strength register
+ * @drv2_addr: vibrator drive strength upper byte register
  * @speed: speed of vibration set from userland
  * @active: state of vibrator
  * @level: level of vibration to set in the chip
@@ -64,6 +85,7 @@ struct pm8xxx_vib {
        const struct pm8xxx_regs *regs;
        unsigned int enable_addr;
        unsigned int drv_addr;
+       unsigned int drv2_addr;
        int speed;
        int level;
        bool active;
@@ -81,6 +103,9 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
        unsigned int val = vib->reg_vib_drv;
        const struct pm8xxx_regs *regs = vib->regs;
 
+       if (regs->drv_in_step)
+               vib->level /= VIB_PER_STEP_mV(vib);
+
        if (on)
                val |= (vib->level << regs->drv_shift) & regs->drv_mask;
        else
@@ -92,6 +117,14 @@ static int pm8xxx_vib_set(struct pm8xxx_vib *vib, bool on)
 
        vib->reg_vib_drv = val;
 
+       if (regs->drv2_mask) {
+               val = vib->level << regs->drv2_shift;
+               rc = regmap_write_bits(vib->regmap, vib->drv2_addr,
+                               regs->drv2_mask, on ? val : 0);
+               if (rc < 0)
+                       return rc;
+       }
+
        if (regs->enable_mask)
                rc = regmap_update_bits(vib->regmap, vib->enable_addr,
                                        regs->enable_mask, on ? regs->enable_mask : 0);
@@ -114,17 +147,16 @@ static void pm8xxx_work_handler(struct work_struct *work)
                return;
 
        /*
-        * pmic vibrator supports voltage ranges from 1.2 to 3.1V, so
+        * pmic vibrator supports voltage ranges from MIN_LEVEL to MAX_LEVEL, so
         * scale the level to fit into these ranges.
         */
        if (vib->speed) {
                vib->active = true;
-               vib->level = ((VIB_MAX_LEVELS * vib->speed) / MAX_FF_SPEED) +
-                                               VIB_MIN_LEVEL_mV;
-               vib->level /= VIB_PER_STEP_mV;
+               vib->level = VIB_MIN_LEVEL_mV(vib);
+               vib->level += mult_frac(VIB_MAX_LEVELS(vib), vib->speed, MAX_FF_SPEED);
        } else {
                vib->active = false;
-               vib->level = VIB_MIN_LEVEL_mV / VIB_PER_STEP_mV;
+               vib->level = VIB_MIN_LEVEL_mV(vib);
        }
 
        pm8xxx_vib_set(vib, vib->active);
@@ -197,6 +229,7 @@ static int pm8xxx_vib_probe(struct platform_device *pdev)
        regs = of_device_get_match_data(&pdev->dev);
        vib->enable_addr = reg_base + regs->enable_offset;
        vib->drv_addr = reg_base + regs->drv_offset;
+       vib->drv2_addr = reg_base + regs->drv2_offset;
 
        /* operate in manual mode */
        error = regmap_read(vib->regmap, vib->drv_addr, &val);
@@ -251,6 +284,7 @@ static const struct of_device_id pm8xxx_vib_id_table[] = {
        { .compatible = "qcom,pm8058-vib", .data = &pm8058_regs },
        { .compatible = "qcom,pm8921-vib", .data = &pm8058_regs },
        { .compatible = "qcom,pm8916-vib", .data = &pm8916_regs },
+       { .compatible = "qcom,pmi632-vib", .data = &pmi632_regs },
        { }
 };
 MODULE_DEVICE_TABLE(of, pm8xxx_vib_id_table);