mfd: palmas: Assign the right powerhold mask for tps65917

The powerhold mask for TPS65917 is different when comapred to
the other palmas versions. Hence assign the right mask that enables
power off of tps65917 pmic correctly.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

2 files changed, 12 insertions, 1 deletions

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 3922a93f9f92..663a2398b6b1 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -430,6 +430,7 @@ static void palmas_power_off(void)
 {
         unsigned int addr;
         int ret, slave;
+        u8 powerhold_mask;
         struct device_node *np = palmas_dev->dev->of_node;
 
         if (of_property_read_bool(np, "ti,palmas-override-powerhold")) {
@@ -437,8 +438,15 @@ static void palmas_power_off(void)
                                           PALMAS_PRIMARY_SECONDARY_PAD2);
                 slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
 
+                if (of_device_is_compatible(np, "ti,tps65917"))
+                        powerhold_mask =
+                                TPS65917_PRIMARY_SECONDARY_PAD2_GPIO_5_MASK;
+                else
+                        powerhold_mask =
+                                PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK;
+
                 ret = regmap_update_bits(palmas_dev->regmap[slave], addr,
-                                PALMAS_PRIMARY_SECONDARY_PAD2_GPIO_7_MASK, 0);
+                                         powerhold_mask, 0);
                 if (ret)
                         dev_err(palmas_dev->dev,
                                 "Unable to write PRIMARY_SECONDARY_PAD2 %d\n",
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 3c8568aa82a5..75e5c8ff85fc 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -3733,6 +3733,9 @@ enum usb_irq_events {
 #define TPS65917_REGEN3_CTRL_MODE_ACTIVE                        0x01
 #define TPS65917_REGEN3_CTRL_MODE_ACTIVE_SHIFT                  0x00
 
+/* POWERHOLD Mask field for PRIMARY_SECONDARY_PAD2 register */
+#define TPS65917_PRIMARY_SECONDARY_PAD2_GPIO_5_MASK             0xC
+
 /* Registers for function RESOURCE */
 #define TPS65917_REGEN1_CTRL                                    0x2
 #define TPS65917_PLLEN_CTRL                                     0x3