Merge branch 'next' into for-linus

[linux-2.6-microblaze.git] / drivers / input / keyboard / mtk-pmic-keys.c

diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
index c31ab43..6404081 100644 (file)
--- a/drivers/input/keyboard/mtk-pmic-keys.c
+++ b/drivers/input/keyboard/mtk-pmic-keys.c
@@ -18,17 +18,9 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 
-#define MTK_PMIC_PWRKEY_RST_EN_MASK    0x1
-#define MTK_PMIC_PWRKEY_RST_EN_SHIFT   6
-#define MTK_PMIC_HOMEKEY_RST_EN_MASK   0x1
-#define MTK_PMIC_HOMEKEY_RST_EN_SHIFT  5
-#define MTK_PMIC_RST_DU_MASK           0x3
-#define MTK_PMIC_RST_DU_SHIFT          8
-
-#define MTK_PMIC_PWRKEY_RST            \
-       (MTK_PMIC_PWRKEY_RST_EN_MASK << MTK_PMIC_PWRKEY_RST_EN_SHIFT)
-#define MTK_PMIC_HOMEKEY_RST           \
-       (MTK_PMIC_HOMEKEY_RST_EN_MASK << MTK_PMIC_HOMEKEY_RST_EN_SHIFT)
+#define MTK_PMIC_RST_DU_MASK   GENMASK(9, 8)
+#define MTK_PMIC_PWRKEY_RST    BIT(6)
+#define MTK_PMIC_HOMEKEY_RST   BIT(5)
 
 #define MTK_PMIC_PWRKEY_INDEX  0
 #define MTK_PMIC_HOMEKEY_INDEX 1
@@ -39,50 +31,58 @@ struct mtk_pmic_keys_regs {
        u32 deb_mask;
        u32 intsel_reg;
        u32 intsel_mask;
+       u32 rst_en_mask;
 };
 
 #define MTK_PMIC_KEYS_REGS(_deb_reg, _deb_mask,                \
-       _intsel_reg, _intsel_mask)                      \
+       _intsel_reg, _intsel_mask, _rst_mask)           \
 {                                                      \
        .deb_reg                = _deb_reg,             \
        .deb_mask               = _deb_mask,            \
        .intsel_reg             = _intsel_reg,          \
        .intsel_mask            = _intsel_mask,         \
+       .rst_en_mask            = _rst_mask,            \
 }
 
 struct mtk_pmic_regs {
        const struct mtk_pmic_keys_regs keys_regs[MTK_PMIC_MAX_KEY_COUNT];
        u32 pmic_rst_reg;
+       u32 rst_lprst_mask; /* Long-press reset timeout bitmask */
 };
 
 static const struct mtk_pmic_regs mt6397_regs = {
        .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6397_CHRSTATUS,
-               0x8, MT6397_INT_RSV, 0x10),
+               0x8, MT6397_INT_RSV, 0x10, MTK_PMIC_PWRKEY_RST),
        .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6397_OCSTATUS2,
-               0x10, MT6397_INT_RSV, 0x8),
+               0x10, MT6397_INT_RSV, 0x8, MTK_PMIC_HOMEKEY_RST),
        .pmic_rst_reg = MT6397_TOP_RST_MISC,
+       .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
 };
 
 static const struct mtk_pmic_regs mt6323_regs = {
        .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6323_CHRSTATUS,
-               0x2, MT6323_INT_MISC_CON, 0x10),
+               0x2, MT6323_INT_MISC_CON, 0x10, MTK_PMIC_PWRKEY_RST),
        .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6323_CHRSTATUS,
-               0x4, MT6323_INT_MISC_CON, 0x8),
+               0x4, MT6323_INT_MISC_CON, 0x8, MTK_PMIC_HOMEKEY_RST),
        .pmic_rst_reg = MT6323_TOP_RST_MISC,
+       .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
 };
 
 static const struct mtk_pmic_regs mt6358_regs = {
        .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6358_TOPSTATUS,
-                                  0x2, MT6358_PSC_TOP_INT_CON0, 0x5),
+                                  0x2, MT6358_PSC_TOP_INT_CON0, 0x5,
+                                  MTK_PMIC_PWRKEY_RST),
        .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
                MTK_PMIC_KEYS_REGS(MT6358_TOPSTATUS,
-                                  0x8, MT6358_PSC_TOP_INT_CON0, 0xa),
+                                  0x8, MT6358_PSC_TOP_INT_CON0, 0xa,
+                                  MTK_PMIC_HOMEKEY_RST),
        .pmic_rst_reg = MT6358_TOP_RST_MISC,
+       .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
 };
 
 struct mtk_pmic_keys_info {
@@ -108,53 +108,49 @@ enum mtk_pmic_keys_lp_mode {
 };
 
 static void mtk_pmic_keys_lp_reset_setup(struct mtk_pmic_keys *keys,
-               u32 pmic_rst_reg)
+                                        const struct mtk_pmic_regs *regs)
 {
-       int ret;
+       const struct mtk_pmic_keys_regs *kregs_home, *kregs_pwr;
        u32 long_press_mode, long_press_debounce;
+       u32 value, mask;
+       int error;
+
+       kregs_home = keys->keys[MTK_PMIC_HOMEKEY_INDEX].regs;
+       kregs_pwr = keys->keys[MTK_PMIC_PWRKEY_INDEX].regs;
 
-       ret = of_property_read_u32(keys->dev->of_node,
-               "power-off-time-sec", &long_press_debounce);
-       if (ret)
+       error = of_property_read_u32(keys->dev->of_node, "power-off-time-sec",
+                                    &long_press_debounce);
+       if (error)
                long_press_debounce = 0;
 
-       regmap_update_bits(keys->regmap, pmic_rst_reg,
-                          MTK_PMIC_RST_DU_MASK << MTK_PMIC_RST_DU_SHIFT,
-                          long_press_debounce << MTK_PMIC_RST_DU_SHIFT);
+       mask = regs->rst_lprst_mask;
+       value = long_press_debounce << (ffs(regs->rst_lprst_mask) - 1);
 
-       ret = of_property_read_u32(keys->dev->of_node,
-               "mediatek,long-press-mode", &long_press_mode);
-       if (ret)
+       error  = of_property_read_u32(keys->dev->of_node,
+                                     "mediatek,long-press-mode",
+                                     &long_press_mode);
+       if (error)
                long_press_mode = LP_DISABLE;
 
        switch (long_press_mode) {
-       case LP_ONEKEY:
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_PWRKEY_RST,
-                                  MTK_PMIC_PWRKEY_RST);
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_HOMEKEY_RST,
-                                  0);
-               break;
        case LP_TWOKEY:
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_PWRKEY_RST,
-                                  MTK_PMIC_PWRKEY_RST);
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_HOMEKEY_RST,
-                                  MTK_PMIC_HOMEKEY_RST);
-               break;
+               value |= kregs_home->rst_en_mask;
+               fallthrough;
+
+       case LP_ONEKEY:
+               value |= kregs_pwr->rst_en_mask;
+               fallthrough;
+
        case LP_DISABLE:
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_PWRKEY_RST,
-                                  0);
-               regmap_update_bits(keys->regmap, pmic_rst_reg,
-                                  MTK_PMIC_HOMEKEY_RST,
-                                  0);
+               mask |= kregs_home->rst_en_mask;
+               mask |= kregs_pwr->rst_en_mask;
                break;
+
        default:
                break;
        }
+
+       regmap_update_bits(keys->regmap, regs->pmic_rst_reg, mask, value);
 }
 
 static irqreturn_t mtk_pmic_keys_irq_handler_thread(int irq, void *data)
@@ -358,7 +354,7 @@ static int mtk_pmic_keys_probe(struct platform_device *pdev)
                return error;
        }
 
-       mtk_pmic_keys_lp_reset_setup(keys, mtk_pmic_regs->pmic_rst_reg);
+       mtk_pmic_keys_lp_reset_setup(keys, mtk_pmic_regs);
 
        platform_set_drvdata(pdev, keys);