]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: mtk-pmic-keys - MT6359 has a specific release irq
authorJulien Massot <julien.massot@collabora.com>
Fri, 5 Sep 2025 11:51:58 +0000 (13:51 +0200)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 6 Sep 2025 16:24:14 +0000 (09:24 -0700)
Support for MT6359 PMIC keys has been added recently. However, the key
release event is not properly handled: only key press events are
generated, leaving key states stuck in "pressed".

This patch ensures that both key press and key release events are
properly emitted by handling the release logic correctly.

Introduce a 'key_release_irq' member to the 'mtk_pmic_regs' to identify
the devices that have a separate irq for the release event.

Fixes: bc25e6bf032e ("Input: mtk-pmic-keys - add support for MT6359 PMIC keys")
Signed-off-by: Julien Massot <julien.massot@collabora.com>
Link: https://lore.kernel.org/r/20250905-radxa-nio-12-l-gpio-v3-1-40f11377fb55@collabora.com
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/mtk-pmic-keys.c

index 50e2e792c91d2626d3f282d04a1db60845827ef2..c78d9f6d97c4f7a77b4c44cee3b93e4712a19aec 100644 (file)
@@ -55,6 +55,7 @@ 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 */
+       bool key_release_irq;
 };
 
 static const struct mtk_pmic_regs mt6397_regs = {
@@ -116,6 +117,7 @@ static const struct mtk_pmic_regs mt6358_regs = {
                                   MTK_PMIC_HOMEKEY_RST),
        .pmic_rst_reg = MT6358_TOP_RST_MISC,
        .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
+       .key_release_irq = true,
 };
 
 static const struct mtk_pmic_regs mt6359_regs = {
@@ -129,6 +131,7 @@ static const struct mtk_pmic_regs mt6359_regs = {
                                   MTK_PMIC_HOMEKEY_RST),
        .pmic_rst_reg = MT6359_TOP_RST_MISC,
        .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
+       .key_release_irq = true,
 };
 
 struct mtk_pmic_keys_info {
@@ -368,7 +371,7 @@ static int mtk_pmic_keys_probe(struct platform_device *pdev)
                if (keys->keys[index].irq < 0)
                        return keys->keys[index].irq;
 
-               if (of_device_is_compatible(node, "mediatek,mt6358-keys")) {
+               if (mtk_pmic_regs->key_release_irq) {
                        keys->keys[index].irq_r = platform_get_irq_byname(pdev,
                                                                          irqnames_r[index]);