lkml.org 
[lkml]   [2020]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 6/9] mfd: mt6360: Rename mt6360_pmu by mt6360
    Date
    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
    \
     
     \ /
      Last update: 2020-07-17 13:04    [W:3.297 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site