summaryrefslogtreecommitdiff
path: root/drivers/mfd/palmas.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/palmas.c')
-rw-r--r--drivers/mfd/palmas.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index be2e256ebfc0..9005da765e38 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -1042,6 +1042,24 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c,
if (ret)
goto err;
+ /*
+ * Programming the Long-Press shutdown delay register.
+ * Using "slave" from previous assignment as this register
+ * too belongs to PALMAS_PMU_CONTROL_BASE block.
+ */
+ if (pdata->long_press_delay != PALMAS_LONG_PRESS_KEY_TIME_DEFAULT) {
+ ret = palmas_update_bits(palmas, PALMAS_PMU_CONTROL_BASE,
+ PALMAS_LONG_PRESS_KEY,
+ PALMAS_LONG_PRESS_KEY_LPK_TIME_MASK,
+ pdata->long_press_delay <<
+ PALMAS_LONG_PRESS_KEY_LPK_TIME_SHIFT);
+ if (ret) {
+ dev_err(palmas->dev,
+ "Failed to update palmas long press delay"
+ "(hard shutdown delay), err: %d\n", ret);
+ goto err;
+ }
+ }
palmas_init_ext_control(palmas);