From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
To: AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
dmitry.torokhov@gmail.com
Cc: matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com,
linux-input@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/5] Input: mtk-pmic-keys - Transfer per-key bit in mtk_pmic_keys_regs
Date: Fri, 20 May 2022 17:38:31 +0200 [thread overview]
Message-ID: <874k1kkydk.fsf@baylibre.com> (raw)
In-Reply-To: <20220520125132.229191-4-angelogioacchino.delregno@collabora.com>
On ven., mai 20, 2022 at 14:51, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote:
> Place the key bit in struct mtk_pmic_keys_regs to enhance this
> driver's flexibility, in preparation for adding support for more
> PMICs.
>
> While at it, also remove the *_MASK and *_SHIFT definitions, as
> these can be simply expressed as BIT(x), and "slightly rename"
> the MTK_PMIC_{HOME,PWR}KEY_RST macro to better reflect the real
> name for these bits.
>
> This commit brings no functional changes.
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
> ---
> drivers/input/keyboard/mtk-pmic-keys.c | 46 ++++++++++++++------------
> 1 file changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
> index 83d0b90cc8cb..d8285612265f 100644
> --- a/drivers/input/keyboard/mtk-pmic-keys.c
> +++ b/drivers/input/keyboard/mtk-pmic-keys.c
> @@ -18,17 +18,11 @@
> #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_MT6397_HOMEKEY_RST_EN BIT(5)
> +#define MTK_PMIC_MT6397_PWRKEY_RST_EN BIT(6)
>
> #define MTK_PMIC_PWRKEY_INDEX 0
> #define MTK_PMIC_HOMEKEY_INDEX 1
> @@ -40,21 +34,24 @@
> * @deb_mask: Bitmask of this key in status register
> * @intsel_reg: Interrupt selector register
> * @intsel_mask: Bitmask of this key in interrupt selector
> + * @rst_en_mask: Bitmask of this key in PMIC keys reset register
> */
> struct mtk_pmic_keys_regs {
> u32 deb_reg;
> 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, \
> }
>
> /**
> @@ -70,30 +67,32 @@ struct mtk_pmic_regs {
> 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_MT6397_PWRKEY_RST_EN),
> .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
> MTK_PMIC_KEYS_REGS(MT6397_OCSTATUS2,
> - 0x10, MT6397_INT_RSV, 0x8),
> + 0x10, MT6397_INT_RSV, 0x8, MTK_PMIC_MT6397_HOMEKEY_RST_EN),
> .pmic_rst_reg = MT6397_TOP_RST_MISC,
> };
>
> 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_MT6397_PWRKEY_RST_EN),
> .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_MT6397_HOMEKEY_RST_EN),
> .pmic_rst_reg = MT6323_TOP_RST_MISC,
> };
>
> 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_MT6397_PWRKEY_RST_EN),
> .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_MT6397_HOMEKEY_RST_EN),
> .pmic_rst_reg = MT6358_TOP_RST_MISC,
> };
>
> @@ -140,6 +139,11 @@ static void mtk_pmic_keys_lp_reset_setup(struct mtk_pmic_keys *keys,
> {
> int ret;
> u32 long_press_mode, long_press_debounce;
> + const struct mtk_pmic_keys_regs *kregs_pwr;
> + const struct mtk_pmic_keys_regs *kregs_home;
> +
> + kregs_pwr = keys->keys[MTK_PMIC_PWRKEY_INDEX].regs;
> + kregs_home = keys->keys[MTK_PMIC_HOMEKEY_INDEX].regs;
>
> ret = of_property_read_u32(keys->dev->of_node,
> "power-off-time-sec", &long_press_debounce);
> @@ -157,16 +161,16 @@ static void mtk_pmic_keys_lp_reset_setup(struct mtk_pmic_keys *keys,
>
> switch (long_press_mode) {
> case LP_ONEKEY:
> - regmap_set_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_PWRKEY_RST);
> - regmap_clear_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_HOMEKEY_RST);
> + regmap_set_bits(keys->regmap, pmic_rst_reg, kregs_pwr->rst_en_mask);
> + regmap_clear_bits(keys->regmap, pmic_rst_reg, kregs_home->rst_en_mask);
> break;
> case LP_TWOKEY:
> - regmap_set_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_PWRKEY_RST);
> - regmap_set_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_HOMEKEY_RST);
> + regmap_set_bits(keys->regmap, pmic_rst_reg, kregs_pwr->rst_en_mask);
> + regmap_set_bits(keys->regmap, pmic_rst_reg, kregs_home->rst_en_mask);
> break;
> case LP_DISABLE:
> - regmap_clear_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_PWRKEY_RST);
> - regmap_clear_bits(keys->regmap, pmic_rst_reg, MTK_PMIC_HOMEKEY_RST);
> + regmap_clear_bits(keys->regmap, pmic_rst_reg, kregs_pwr->rst_en_mask);
> + regmap_clear_bits(keys->regmap, pmic_rst_reg, kregs_home->rst_en_mask);
> break;
> default:
> break;
> --
> 2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-20 15:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-20 12:51 [PATCH 0/5] MediaTek Helio X10 MT6795 - MT6331 PMIC Keys AngeloGioacchino Del Regno
2022-05-20 12:51 ` [PATCH 1/5] Input: mtk-pmic-keys - Add kerneldoc to driver structures AngeloGioacchino Del Regno
2022-05-20 15:38 ` Mattijs Korpershoek
2022-05-23 4:33 ` Dmitry Torokhov
2022-05-23 8:54 ` AngeloGioacchino Del Regno
2022-05-23 16:17 ` Dmitry Torokhov
2022-05-20 12:51 ` [PATCH 2/5] Input: mtk-pmic-keys - Use regmap_{set, clear}_bits where possible AngeloGioacchino Del Regno
2022-05-20 15:38 ` [PATCH 2/5] Input: mtk-pmic-keys - Use regmap_{set,clear}_bits " Mattijs Korpershoek
2022-05-23 4:51 ` Dmitry Torokhov
2022-05-23 8:58 ` AngeloGioacchino Del Regno
2022-05-23 16:58 ` Dmitry Torokhov
2022-05-20 12:51 ` [PATCH 3/5] Input: mtk-pmic-keys - Transfer per-key bit in mtk_pmic_keys_regs AngeloGioacchino Del Regno
2022-05-20 15:38 ` Mattijs Korpershoek [this message]
2022-05-20 12:51 ` [PATCH 4/5] Input: mtk-pmic-keys - Move long press debounce mask to mtk_pmic_regs AngeloGioacchino Del Regno
2022-05-20 15:38 ` Mattijs Korpershoek
2022-05-20 12:51 ` [PATCH 5/5] Input: mtk-pmic-keys - Add support for MT6331 PMIC keys AngeloGioacchino Del Regno
2022-05-20 15:38 ` Mattijs Korpershoek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874k1kkydk.fsf@baylibre.com \
--to=mkorpershoek@baylibre.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).