From: Gene Chen <gene.chen.richtek@gmail.com>
To: lee.jones@linaro.org, matthias.bgg@gmail.com, rafael@kernel.org
Cc: broonie@kernel.org, gregkh@linuxfoundation.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
gene_chen@richtek.com, benjamin.chao@mediatek.com,
shufan_lee@richtek.com, cy_huang@richtek.com
Subject: [PATCH 7/9] mfd: mt6360: Remove handle_post_irq callback function
Date: Wed, 5 Aug 2020 00:33:00 +0800 [thread overview]
Message-ID: <1596558782-3415-9-git-send-email-gene.chen.richtek@gmail.com> (raw)
In-Reply-To: <1596558782-3415-1-git-send-email-gene.chen.richtek@gmail.com>
From: Gene Chen <gene_chen@richtek.com>
Remove handle_post_irq which is used to retrigger IRQ.
Set IRQ level low trigger in dtsi to keep IRQ always be handled.
Signed-off-by: Gene Chen <gene_chen@richtek.com>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/mt6360-core.c | 17 ++++-------------
include/linux/mfd/mt6360.h | 2 +-
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index f75122b..2356d99 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -208,15 +208,8 @@ static const struct regmap_irq mt6360_irqs[] = {
REGMAP_IRQ_REG_LINE(MT6360_LDO7_PGB_EVT, 8),
};
-static int mt6360_pmu_handle_post_irq(void *irq_drv_data)
-{
- struct mt6360_ddata *ddata = irq_drv_data;
-
- return regmap_update_bits(ddata->regmap,
- MT6360_PMU_IRQ_SET, MT6360_IRQ_RETRIG, MT6360_IRQ_RETRIG);
-}
-
-static struct regmap_irq_chip mt6360_irq_chip = {
+static const struct regmap_irq_chip mt6360_irq_chip = {
+ .name = "mt6360_irqs",
.irqs = mt6360_irqs,
.num_irqs = ARRAY_SIZE(mt6360_irqs),
.num_regs = MT6360_PMU_IRQ_REGNUM,
@@ -225,7 +218,6 @@ static struct regmap_irq_chip mt6360_irq_chip = {
.ack_base = MT6360_PMU_CHG_IRQ1,
.init_ack_masked = true,
.use_ack = true,
- .handle_post_irq = mt6360_pmu_handle_post_irq,
};
static const struct regmap_config mt6360_pmu_regmap_config = {
@@ -339,10 +331,9 @@ static int mt6360_probe(struct i2c_client *client)
return -ENODEV;
}
- mt6360_irq_chip.irq_drv_data = ddata;
ret = devm_regmap_add_irq_chip(&client->dev, ddata->regmap, client->irq,
- IRQF_TRIGGER_FALLING, 0,
- &mt6360_irq_chip, &ddata->irq_data);
+ 0, 0, &mt6360_irq_chip,
+ &ddata->irq_data);
if (ret) {
dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
return ret;
diff --git a/include/linux/mfd/mt6360.h b/include/linux/mfd/mt6360.h
index fbe106c..da0fb5c 100644
--- a/include/linux/mfd/mt6360.h
+++ b/include/linux/mfd/mt6360.h
@@ -230,7 +230,7 @@ struct mt6360_data {
#define MT6360_PMU_MAXREG MT6360_PMU_LDO_MASK2
/* MT6360_PMU_IRQ_SET */
-#define MT6360_PMU_IRQ_REGNUM (MT6360_PMU_LDO_IRQ2 - MT6360_PMU_CHG_IRQ1 + 1)
+#define MT6360_PMU_IRQ_REGNUM 16
#define MT6360_IRQ_RETRIG BIT(2)
#define CHIP_VEN_MASK 0xF0
--
2.7.4
next prev parent reply other threads:[~2020-08-04 16:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 16:32 [PATCH v3 0/9] mfd: mt6360: Merge different sub-devices I2C read/write Gene Chen
2020-08-04 16:32 ` [PATCH 1/9] mfd: mt6360: Rearrange include file Gene Chen
2020-08-04 16:32 ` [PATCH 2/9] mfd: mt6360: Remove redundant brackets around raw numbers Gene Chen
2020-08-04 16:32 ` [PATCH 3/9] mfd: mt6360: Indicate sub-dev compatible name by using "-" Gene Chen
2020-08-04 16:32 ` [PATCH 4/9] mfd: mt6360: Combine mt6360 pmic/ldo resources into mt6360 regulator resources Gene Chen
2020-08-04 16:32 ` [PATCH 5/9] mfd: mt6360: Rename mt6360_pmu_data by mt6360_data Gene Chen
2020-08-04 16:32 ` [PATCH 5/9] mfd: mt6360: Rename mt6360_pmu_data by mt6360_ddata Gene Chen
2020-08-04 16:32 ` [PATCH 6/9] mfd: mt6360: Rename mt6360_pmu by mt6360 Gene Chen
2020-08-04 16:33 ` Gene Chen [this message]
2020-08-04 16:33 ` [PATCH 8/9] mfd: mt6360: Fix flow which is used to check ic exist Gene Chen
2020-08-04 16:33 ` [PATCH 9/9] mfd: mt6360: Merge different sub-devices I2C read/write Gene Chen
2020-08-05 16:10 ` Mark Brown
2020-08-06 3:30 ` Gene Chen
2020-08-06 12:13 ` Mark Brown
2020-08-07 2:16 ` Gene Chen
2020-08-07 11:13 ` Mark Brown
2020-08-10 7:08 ` Lee Jones
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=1596558782-3415-9-git-send-email-gene.chen.richtek@gmail.com \
--to=gene.chen.richtek@gmail.com \
--cc=benjamin.chao@mediatek.com \
--cc=broonie@kernel.org \
--cc=cy_huang@richtek.com \
--cc=gene_chen@richtek.com \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=rafael@kernel.org \
--cc=shufan_lee@richtek.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).