From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5120BC433FE for ; Fri, 20 May 2022 15:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OCrzi8yRxXXdoPc7HFG9ZTPPtjgH48DIP7GHq/3bEMI=; b=B7e9PGVCp9QXgR AGEUBwqO5hTSve2DriU4v0Nq+rw8H9ZHdfKup1LA2u3/Xd9GVyn7/k3gdaJExJbADtDf9Xeix/6dC AJSDAJoOOoqz9pFuhEhj1BesyaGxPP5C1i4ZhM+sNa1TE20in9hLw2Hwy0EWCg18vzWsBgMjEZhzM hosTU+tvKCdf6KsLd3eH/eEYyTd7V52xncNwSbhbCmmv/FswL+SxiHtVtirwf8Ps70v+rGfLnghjd UVAoejzxOxRcc2uIzGq7RtvaPVJSvWtXbrgTj+SxmF4cY7N86xCD4doyolNZA8n8rH9wLEpfE5Wf4 LbC8qaksGMf55f4642dQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns4ib-00DH5l-Gu; Fri, 20 May 2022 15:39:09 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns4i4-00DGpa-VF for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2022 15:38:39 +0000 Received: by mail-wr1-x431.google.com with SMTP id h5so10866691wrb.11 for ; Fri, 20 May 2022 08:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=Ch3JaRYsWBaRQyyQSaegfZcgNn3JYTpcgpD9p93zsi0=; b=BY1FqXli4TOEwBg63OaVGNdly8bNSEBgEeoVLGRcCl93RUHxozyzVnLWBxNiiHNnIb c6ZAXhhKjXBPC/ksMWrS91Ndv0miTlNWVHfZ80bJaUXIrzPs7jz2JNEP1y3KzcBbL/jL qVCbq5xTAu7FA5G/mHnLTq2sLuEka6UNZY3FRmyffiKmcGylcK2smkmIEAB7x294ciz2 vDwkuiPBYDeV54G6+DudJmv90mS6nqGvhUboo7RYS7Q8MV3stCFBHNmieeUQ3e0GBTVl IHmyPBTRATA7v7JVyTpacijgcFCobbXEi2ZfF8RQTbd5BNZQoG+J4UgwPmYxPq3K6zuc oisQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=Ch3JaRYsWBaRQyyQSaegfZcgNn3JYTpcgpD9p93zsi0=; b=EGLuJklThmwb4rNJBhc2fXciP0PdSQQMISeJ2lH/BscyYN710iKrdkrJh79gG9vOtz fsiD3WN48UIJgRvgWPWu1DnslcQcB28qmU3NU7vOYrJfZtc945i8bfsK6Npn3YF451fI CypaXUFUpucTKpJ1PISjd5KwKuhsxP1GrXvWh2wk+muLadH499N7fRxOLEhpItyNtkg7 1BYfhlS92yi7Hi3c4+Ph2veq3l5opD9+Es4NXlvh9gf5SoJQu7Lq70qu/+x6C7270f90 oScVYyNWrL6lGDRsYb4TaInSWcwVIMmuWnNwuvRIryETjaPMhK/U96LLU1j0eaBzfa4i lkgg== X-Gm-Message-State: AOAM533MyX5WPVdBLy/qZSr1W+FUB8Isp35b3Lyd+gD7jdhz2cwaOYCt kj3qcKWmWzPJ+k4BRCm7bB1HZg== X-Google-Smtp-Source: ABdhPJzVSD4PBgB+VfBmhbz+EkcV3IHwMXyJG3ofUjWKkWJxkcPBsJJki2o9dwaQg7B0ao6+gegkvg== X-Received: by 2002:adf:dccc:0:b0:20e:5930:9e85 with SMTP id x12-20020adfdccc000000b0020e59309e85mr8837405wrm.20.1653061112894; Fri, 20 May 2022 08:38:32 -0700 (PDT) Received: from localhost ([2a01:cb19:85e6:1900:41e3:1219:c56c:30b8]) by smtp.gmail.com with ESMTPSA id k10-20020adfc70a000000b0020c66310845sm2759639wrg.55.2022.05.20.08.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 08:38:32 -0700 (PDT) From: Mattijs Korpershoek To: AngeloGioacchino Del Regno , 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 In-Reply-To: <20220520125132.229191-4-angelogioacchino.delregno@collabora.com> References: <20220520125132.229191-1-angelogioacchino.delregno@collabora.com> <20220520125132.229191-4-angelogioacchino.delregno@collabora.com> Date: Fri, 20 May 2022 17:38:31 +0200 Message-ID: <874k1kkydk.fsf@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220520_083837_102047_50E68883 X-CRM114-Status: GOOD ( 20.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On ven., mai 20, 2022 at 14:51, AngeloGioacchino Del Regno 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 Reviewed-by: Mattijs Korpershoek > --- > 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 > #include > > -#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