]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mfd: bd718x7: Make power button press duration configurable
authorLeonard Crestez <leonard.crestez@nxp.com>
Tue, 21 May 2019 20:41:14 +0000 (20:41 +0000)
committerLee Jones <lee.jones@linaro.org>
Tue, 2 Jul 2019 11:11:31 +0000 (12:11 +0100)
Allow overwriting the values in BD718XX_REG_PWRONCONFIG0 and
BD718XX_REG_PWRONCONFIG1 via devicetree. Read values in milliseconds and
attempt to round them to something supported by the hardware.

Keep existing values (from bootloader or OTP) if property is not
present.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-By: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
[Lee: Fixed-up merge/API conflict]
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/rohm-bd718x7.c

index af91092c7fca822362641068baa837f5649123db..85e7f51333659551229583db92470586bea0af64 100644 (file)
@@ -81,6 +81,44 @@ static const struct regmap_config bd718xx_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
+static int bd718xx_init_press_duration(struct bd718xx *bd718xx)
+{
+       struct device* dev = bd718xx->chip.dev;
+       u32 short_press_ms, long_press_ms;
+       u32 short_press_value, long_press_value;
+       int ret;
+
+       ret = of_property_read_u32(dev->of_node, "rohm,short-press-ms",
+                                  &short_press_ms);
+       if (!ret) {
+               short_press_value = min(15u, (short_press_ms + 250) / 500);
+               ret = regmap_update_bits(bd718xx->chip.regmap,
+                                        BD718XX_REG_PWRONCONFIG0,
+                                        BD718XX_PWRBTN_PRESS_DURATION_MASK,
+                                        short_press_value);
+               if (ret) {
+                       dev_err(dev, "Failed to init pwron short press\n");
+                       return ret;
+               }
+       }
+
+       ret = of_property_read_u32(dev->of_node, "rohm,long-press-ms",
+                                  &long_press_ms);
+       if (!ret) {
+               long_press_value = min(15u, (long_press_ms + 500) / 1000);
+               ret = regmap_update_bits(bd718xx->chip.regmap,
+                                        BD718XX_REG_PWRONCONFIG1,
+                                        BD718XX_PWRBTN_PRESS_DURATION_MASK,
+                                        long_press_value);
+               if (ret) {
+                       dev_err(dev, "Failed to init pwron long press\n");
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 static int bd718xx_i2c_probe(struct i2c_client *i2c,
                            const struct i2c_device_id *id)
 {
@@ -118,6 +156,10 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c,
                return ret;
        }
 
+       ret = bd718xx_init_press_duration(bd718xx);
+       if (ret)
+               return ret;
+
        ret = regmap_irq_get_virq(bd718xx->irq_data, BD718XX_INT_PWRBTN_S);
 
        if (ret < 0) {