From: matthias.bgg@gmail.com (Matthias Brugger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 05/11] soc: mediatek: PMIC wrap: WRAP_INT_EN needs a different bitmask for MT2701/7623
Date: Mon, 1 Feb 2016 11:48:36 +0100 [thread overview]
Message-ID: <56AF3804.6070205@gmail.com> (raw)
In-Reply-To: <1453715604-36856-6-git-send-email-blogic@openwrt.org>
On 25/01/16 10:53, John Crispin wrote:
> MT2701 and MT7623 use a different bitmask for PWRAP_INT_EN.
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
> ---
> drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
> index ab2202d..948fc73 100644
> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
> @@ -371,6 +371,7 @@ struct pmic_wrapper_type {
> int *regs;
> enum pwrap_type type;
> u32 arb_en_all;
> + u32 int_en_all;
> int (*init_reg_clock)(struct pmic_wrapper *wrp);
> int (*init_special)(struct pmic_wrapper *wrp);
> };
> @@ -824,6 +825,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
> .regs = mt8135_regs,
> .type = PWRAP_MT8135,
> .arb_en_all = 0x1ff,
> + .int_en_all = BIT(31) | BIT(1),
> .init_reg_clock = pwrap_mt8135_init_reg_clock,
> .init_special = pwrap_mt8135_init_special,
> };
> @@ -832,6 +834,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
> .regs = mt8173_regs,
> .type = PWRAP_MT8173,
> .arb_en_all = 0x3f,
> + .int_en_all = BIT(31) | BIT(1),
> .init_reg_clock = pwrap_mt8173_init_reg_clock,
> .init_special = pwrap_mt8173_init_special,
> };
> @@ -945,7 +948,7 @@ static int pwrap_probe(struct platform_device *pdev)
> PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
> pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
> pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
> - pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN);
> + pwrap_writel(wrp, ~wrp->master->int_en_all, PWRAP_INT_EN);
>
Set the right value in int_en_all instead of use the bitwise not in
pwrap_writel.
next prev parent reply other threads:[~2016-02-01 10:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 9:53 [PATCH V3 00/11] soc: mediatek: PMIC wrap: add MT6323/2701/7623 support John Crispin
2016-01-25 9:53 ` [PATCH V3 01/11] dt-bindings: ARM: Mediatek: add MT2701/7623 string to the PMIC wrapper doc John Crispin
2016-01-26 2:44 ` Rob Herring
2016-01-25 9:53 ` [PATCH V3 02/11] soc: mediatek: PMIC wrap: don't duplicate the wrapper data John Crispin
2016-01-25 9:53 ` [PATCH V3 03/11] soc: mediatek: PMIC wrap: add wrapper callbacks for init_reg_clock John Crispin
2016-01-25 9:53 ` [PATCH V3 04/11] soc: mediatek: PMIC wrap: split SoC specific init into callback John Crispin
2016-02-01 10:43 ` Matthias Brugger
2016-01-25 9:53 ` [PATCH V3 05/11] soc: mediatek: PMIC wrap: WRAP_INT_EN needs a different bitmask for MT2701/7623 John Crispin
2016-02-01 10:48 ` Matthias Brugger [this message]
2016-01-25 9:53 ` [PATCH V3 06/11] soc: mediatek: PMIC wrap:: SPI_WRITE " John Crispin
2016-01-26 12:46 ` Yingjoe Chen
2016-01-25 9:53 ` [PATCH V3 07/11] soc: mediatek: PMIC wrap: move wdt_src into the pmic_wrapper_type struct John Crispin
2016-01-25 9:53 ` [PATCH V3 08/11] soc: mediatek: PMIC wrap: remove pwrap_is_mt8135() and pwrap_is_mt8173() John Crispin
2016-01-26 12:53 ` Yingjoe Chen
2016-02-01 10:55 ` Matthias Brugger
2016-01-25 9:53 ` [PATCH V3 09/11] soc: mediatek: PMIC wrap: add a slave specific struct John Crispin
2016-01-26 9:31 ` Yingjoe Chen
2016-02-01 11:02 ` Matthias Brugger
2016-01-25 9:53 ` [PATCH V3 10/11] soc: mediatek: PMIC wrap: add mt6323 slave support John Crispin
2016-01-25 9:53 ` [PATCH V3 11/11] soc: mediatek: PMIC wrap: add MT2701/7623 support John Crispin
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=56AF3804.6070205@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).