From: Gene Chen <gene.chen.richtek@gmail.com>
To: lee.jones@linaro.org, matthias.bgg@gmail.com
Cc: 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 v2 6/9] mfd: mt6360: Rename mt6360_pmu by mt6360
Date: Fri, 17 Jul 2020 19:03:28 +0800 [thread overview]
Message-ID: <1594983811-25908-7-git-send-email-gene.chen.richtek@gmail.com> (raw)
In-Reply-To: <1594983811-25908-1-git-send-email-gene.chen.richtek@gmail.com>
From: Gene Chen <gene_chen@richtek.com>
Rename mt6360_pmu by mt6360, because of including
not only PMU part, but also entire MT6360 IC
Signed-off-by: Gene Chen <gene_chen@richtek.com>
---
drivers/mfd/mt6360-core.c | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 62bae1a..5dfc13e 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -119,7 +119,7 @@
#define MT6360_LDO6_PGB_EVT 126
#define MT6360_LDO7_PGB_EVT 127
-static const struct regmap_irq mt6360_pmu_irqs[] = {
+static const struct regmap_irq mt6360_irqs[] = {
REGMAP_IRQ_REG_LINE(MT6360_CHG_TREG_EVT, 8),
REGMAP_IRQ_REG_LINE(MT6360_CHG_AICR_EVT, 8),
REGMAP_IRQ_REG_LINE(MT6360_CHG_MIVR_EVT, 8),
@@ -216,9 +216,9 @@ static int mt6360_pmu_handle_post_irq(void *irq_drv_data)
MT6360_PMU_IRQ_SET, MT6360_IRQ_RETRIG, MT6360_IRQ_RETRIG);
}
-static struct regmap_irq_chip mt6360_pmu_irq_chip = {
- .irqs = mt6360_pmu_irqs,
- .num_irqs = ARRAY_SIZE(mt6360_pmu_irqs),
+static struct regmap_irq_chip mt6360_irq_chip = {
+ .irqs = mt6360_irqs,
+ .num_irqs = ARRAY_SIZE(mt6360_irqs),
.num_regs = MT6360_PMU_IRQ_REGNUM,
.mask_base = MT6360_PMU_CHG_MASK1,
.status_base = MT6360_PMU_CHG_IRQ1,
@@ -308,7 +308,7 @@ static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
MT6360_TCPC_SLAVEID,
};
-static int mt6360_pmu_probe(struct i2c_client *client)
+static int mt6360_probe(struct i2c_client *client)
{
struct mt6360_data *data;
unsigned int reg_data;
@@ -339,10 +339,10 @@ static int mt6360_pmu_probe(struct i2c_client *client)
return -ENODEV;
}
- mt6360_pmu_irq_chip.irq_drv_data = data;
+ mt6360_irq_chip.irq_drv_data = data;
ret = devm_regmap_add_irq_chip(&client->dev, data->regmap, client->irq,
IRQF_TRIGGER_FALLING, 0,
- &mt6360_pmu_irq_chip, &data->irq_data);
+ &mt6360_irq_chip, &data->irq_data);
if (ret) {
dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
return ret;
@@ -374,7 +374,7 @@ static int mt6360_pmu_probe(struct i2c_client *client)
return 0;
}
-static int __maybe_unused mt6360_pmu_suspend(struct device *dev)
+static int __maybe_unused mt6360_suspend(struct device *dev)
{
struct i2c_client *i2c = to_i2c_client(dev);
@@ -384,7 +384,7 @@ static int __maybe_unused mt6360_pmu_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused mt6360_pmu_resume(struct device *dev)
+static int __maybe_unused mt6360_resume(struct device *dev)
{
struct i2c_client *i2c = to_i2c_client(dev);
@@ -395,25 +395,24 @@ static int __maybe_unused mt6360_pmu_resume(struct device *dev)
return 0;
}
-static SIMPLE_DEV_PM_OPS(mt6360_pmu_pm_ops,
- mt6360_pmu_suspend, mt6360_pmu_resume);
+static SIMPLE_DEV_PM_OPS(mt6360_pm_ops, mt6360_suspend, mt6360_resume);
-static const struct of_device_id __maybe_unused mt6360_pmu_of_id[] = {
- { .compatible = "mediatek,mt6360_pmu", },
+static const struct of_device_id __maybe_unused mt6360_of_id[] = {
+ { .compatible = "mediatek,mt6360", },
{},
};
-MODULE_DEVICE_TABLE(of, mt6360_pmu_of_id);
+MODULE_DEVICE_TABLE(of, mt6360_of_id);
-static struct i2c_driver mt6360_pmu_driver = {
+static struct i2c_driver mt6360_driver = {
.driver = {
- .name = "mt6360_pmu",
- .pm = &mt6360_pmu_pm_ops,
- .of_match_table = of_match_ptr(mt6360_pmu_of_id),
+ .name = "mt6360",
+ .pm = &mt6360_pm_ops,
+ .of_match_table = of_match_ptr(mt6360_of_id),
},
- .probe_new = mt6360_pmu_probe,
+ .probe_new = mt6360_probe,
};
-module_i2c_driver(mt6360_pmu_driver);
+module_i2c_driver(mt6360_driver);
MODULE_AUTHOR("Gene Chen <gene_chen@richtek.com>");
-MODULE_DESCRIPTION("MT6360 PMU I2C Driver");
+MODULE_DESCRIPTION("MT6360 I2C Driver");
MODULE_LICENSE("GPL v2");
--
2.7.4
next prev parent reply other threads:[~2020-07-17 11:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 11:03 [PATCH v2 0/9] mfd: mt6360: Merge different sub-devices i2c read/write Gene Chen
2020-07-17 11:03 ` [PATCH v2 1/9] mfd: mt6360: Rearrange include file Gene Chen
2020-07-27 11:08 ` Lee Jones
2020-07-27 18:16 ` Gene Chen
2020-07-28 6:56 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 2/9] mfd: mt6360: Remove redundant brackets around raw numbers Gene Chen
2020-07-27 11:09 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 3/9] mfd: mt6360: Indicate sub-dev compatible name by using "-" Gene Chen
2020-07-27 11:18 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 4/9] mfd: mt6360: Combine mt6360 pmic/ldo resouces into mt6360 regulator resources Gene Chen
2020-07-27 11:29 ` Lee Jones
2020-07-27 18:28 ` Gene Chen
2020-07-28 6:54 ` Lee Jones
2020-07-31 2:58 ` Gene Chen
2020-07-31 11:12 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 5/9] mfd: mt6360: Rename mt6360_pmu_data by mt6360_data Gene Chen
2020-07-27 12:06 ` Lee Jones
2020-07-17 11:03 ` Gene Chen [this message]
2020-07-27 12:21 ` [PATCH v2 6/9] mfd: mt6360: Rename mt6360_pmu by mt6360 Lee Jones
2020-07-17 11:03 ` [PATCH v2 7/9] mfd: mt6360: Remove handle_post_irq callback function Gene Chen
2020-07-27 12:23 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 8/9] mfd: mt6360: Fix flow which is used to check ic exist Gene Chen
2020-07-27 12:26 ` Lee Jones
2020-07-17 11:03 ` [PATCH v2 9/9] mfd: mt6360: Merge different sub-devices i2c read/write Gene Chen
2020-07-27 12:43 ` Lee Jones
2020-07-29 0:51 ` Gene Chen
2020-07-29 10:12 ` Lee Jones
2020-07-30 2:56 ` Gene Chen
2020-07-31 0:51 ` Gene Chen
2020-07-31 9:06 ` 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=1594983811-25908-7-git-send-email-gene.chen.richtek@gmail.com \
--to=gene.chen.richtek@gmail.com \
--cc=benjamin.chao@mediatek.com \
--cc=cy_huang@richtek.com \
--cc=gene_chen@richtek.com \
--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=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).