Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Input: mtk-pmic-keys - add support for MT6331 PMIC keys

Add support for PMIC Keys of the MT6331 PMIC.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20220913123941.385349-1-angelogioacchino.delregno@collabora.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

AngeloGioacchino Del Regno and committed by
Dmitry Torokhov
cd01569b e7ed42a4

+21
+21
drivers/input/keyboard/mtk-pmic-keys.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/mfd/mt6323/registers.h> 12 + #include <linux/mfd/mt6331/registers.h> 12 13 #include <linux/mfd/mt6358/registers.h> 13 14 #include <linux/mfd/mt6397/core.h> 14 15 #include <linux/mfd/mt6397/registers.h> ··· 22 21 #define MTK_PMIC_RST_DU_MASK GENMASK(9, 8) 23 22 #define MTK_PMIC_PWRKEY_RST BIT(6) 24 23 #define MTK_PMIC_HOMEKEY_RST BIT(5) 24 + 25 + #define MTK_PMIC_MT6331_RST_DU_MASK GENMASK(13, 12) 26 + #define MTK_PMIC_MT6331_PWRKEY_RST BIT(9) 27 + #define MTK_PMIC_MT6331_HOMEKEY_RST BIT(8) 25 28 26 29 #define MTK_PMIC_PWRKEY_INDEX 0 27 30 #define MTK_PMIC_HOMEKEY_INDEX 1 ··· 75 70 0x4, MT6323_INT_MISC_CON, 0x8, MTK_PMIC_HOMEKEY_RST), 76 71 .pmic_rst_reg = MT6323_TOP_RST_MISC, 77 72 .rst_lprst_mask = MTK_PMIC_RST_DU_MASK, 73 + }; 74 + 75 + static const struct mtk_pmic_regs mt6331_regs = { 76 + .keys_regs[MTK_PMIC_PWRKEY_INDEX] = 77 + MTK_PMIC_KEYS_REGS(MT6331_TOPSTATUS, 0x2, 78 + MT6331_INT_MISC_CON, 0x4, 79 + MTK_PMIC_MT6331_PWRKEY_RST), 80 + .keys_regs[MTK_PMIC_HOMEKEY_INDEX] = 81 + MTK_PMIC_KEYS_REGS(MT6331_TOPSTATUS, 0x4, 82 + MT6331_INT_MISC_CON, 0x2, 83 + MTK_PMIC_MT6331_HOMEKEY_RST), 84 + .pmic_rst_reg = MT6331_TOP_RST_MISC, 85 + .rst_lprst_mask = MTK_PMIC_MT6331_RST_DU_MASK, 78 86 }; 79 87 80 88 static const struct mtk_pmic_regs mt6358_regs = { ··· 273 255 }, { 274 256 .compatible = "mediatek,mt6323-keys", 275 257 .data = &mt6323_regs, 258 + }, { 259 + .compatible = "mediatek,mt6331-keys", 260 + .data = &mt6331_regs, 276 261 }, { 277 262 .compatible = "mediatek,mt6358-keys", 278 263 .data = &mt6358_regs,