diff mbox series

[1/4] mfd: mt6360: Refactor and fix code style

Message ID 1594117856-14343-2-git-send-email-gene.chen.richtek@gmail.com (mailing list archive)
State New, archived
Headers show
Series mfd: mt6360: Merge different sub-devices i2c read/write | expand

Commit Message

Gene Chen July 7, 2020, 10:30 a.m. UTC 
From: Gene Chen <gene_chen@richtek.com>

Rearrange include file.
Remove brackets around raw numbers.
Indicate sub-dev compatible name by using "-"
Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
Rename mt6360_pmu_data by mt6360_data.
Rename mt6360_pmu by mt6360.

Signed-off-by: Gene Chen <gene_chen@richtek.com>
---
 drivers/mfd/mt6360-core.c  | 293 ++++++++++++++++++++++-----------------------
 include/linux/mfd/mt6360.h |   2 +-
 2 files changed, 144 insertions(+), 151 deletions(-)

Comments

Matthias Brugger July 10, 2020, 2:06 p.m. UTC | #1 
On 07/07/2020 12:30, Gene Chen wrote:
> From: Gene Chen <gene_chen@richtek.com>
> 
> Rearrange include file.
> Remove brackets around raw numbers.
> Indicate sub-dev compatible name by using "-"
> Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> Rename mt6360_pmu_data by mt6360_data.
> Rename mt6360_pmu by mt6360.

That seems like a lot of cosmetics. Why is this needed?
If you think that's needed it should be split up in different commits, each 
explaining in the commit message why you do that.

Regards,
Matthias

> 
> Signed-off-by: Gene Chen <gene_chen@richtek.com>
> ---
>   drivers/mfd/mt6360-core.c  | 293 ++++++++++++++++++++++-----------------------
>   include/linux/mfd/mt6360.h |   2 +-
>   2 files changed, 144 insertions(+), 151 deletions(-)
> 
> diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
> index e9cacc2..5dfc13e 100644
> --- a/drivers/mfd/mt6360-core.c
> +++ b/drivers/mfd/mt6360-core.c
> @@ -5,122 +5,121 @@
>    * Author: Gene Chen <gene_chen@richtek.com>
>    */
>   
> +#include <linux/kernel.h>
> +#include <linux/module.h>
>   #include <linux/i2c.h>
> -#include <linux/init.h>
> +#include <linux/crc8.h>
> +#include <linux/slab.h>
> +#include <linux/regmap.h>
>   #include <linux/interrupt.h>
> -#include <linux/kernel.h>
>   #include <linux/mfd/core.h>
> -#include <linux/module.h>
> -#include <linux/of_irq.h>
> -#include <linux/of_platform.h>
> -#include <linux/version.h>
>   
>   #include <linux/mfd/mt6360.h>
>   
>   /* reg 0 -> 0 ~ 7 */
> -#define MT6360_CHG_TREG_EVT		(4)
> -#define MT6360_CHG_AICR_EVT		(5)
> -#define MT6360_CHG_MIVR_EVT		(6)
> -#define MT6360_PWR_RDY_EVT		(7)
> +#define MT6360_CHG_TREG_EVT		4
> +#define MT6360_CHG_AICR_EVT		5
> +#define MT6360_CHG_MIVR_EVT		6
> +#define MT6360_PWR_RDY_EVT		7
>   /* REG 1 -> 8 ~ 15 */
> -#define MT6360_CHG_BATSYSUV_EVT		(9)
> -#define MT6360_FLED_CHG_VINOVP_EVT	(11)
> -#define MT6360_CHG_VSYSUV_EVT		(12)
> -#define MT6360_CHG_VSYSOV_EVT		(13)
> -#define MT6360_CHG_VBATOV_EVT		(14)
> -#define MT6360_CHG_VBUSOV_EVT		(15)
> +#define MT6360_CHG_BATSYSUV_EVT		9
> +#define MT6360_FLED_CHG_VINOVP_EVT	11
> +#define MT6360_CHG_VSYSUV_EVT		12
> +#define MT6360_CHG_VSYSOV_EVT		13
> +#define MT6360_CHG_VBATOV_EVT		14
> +#define MT6360_CHG_VBUSOV_EVT		15
>   /* REG 2 -> 16 ~ 23 */
>   /* REG 3 -> 24 ~ 31 */
> -#define MT6360_WD_PMU_DET		(25)
> -#define MT6360_WD_PMU_DONE		(26)
> -#define MT6360_CHG_TMRI			(27)
> -#define MT6360_CHG_ADPBADI		(29)
> -#define MT6360_CHG_RVPI			(30)
> -#define MT6360_OTPI			(31)
> +#define MT6360_WD_PMU_DET		25
> +#define MT6360_WD_PMU_DONE		26
> +#define MT6360_CHG_TMRI			27
> +#define MT6360_CHG_ADPBADI		29
> +#define MT6360_CHG_RVPI			30
> +#define MT6360_OTPI			31
>   /* REG 4 -> 32 ~ 39 */
> -#define MT6360_CHG_AICCMEASL		(32)
> -#define MT6360_CHGDET_DONEI		(34)
> -#define MT6360_WDTMRI			(35)
> -#define MT6360_SSFINISHI		(36)
> -#define MT6360_CHG_RECHGI		(37)
> -#define MT6360_CHG_TERMI		(38)
> -#define MT6360_CHG_IEOCI		(39)
> +#define MT6360_CHG_AICCMEASL		32
> +#define MT6360_CHGDET_DONEI		34
> +#define MT6360_WDTMRI			35
> +#define MT6360_SSFINISHI		36
> +#define MT6360_CHG_RECHGI		37
> +#define MT6360_CHG_TERMI		38
> +#define MT6360_CHG_IEOCI		39
>   /* REG 5 -> 40 ~ 47 */
> -#define MT6360_PUMPX_DONEI		(40)
> -#define MT6360_BAT_OVP_ADC_EVT		(41)
> -#define MT6360_TYPEC_OTP_EVT		(42)
> -#define MT6360_ADC_WAKEUP_EVT		(43)
> -#define MT6360_ADC_DONEI		(44)
> -#define MT6360_BST_BATUVI		(45)
> -#define MT6360_BST_VBUSOVI		(46)
> -#define MT6360_BST_OLPI			(47)
> +#define MT6360_PUMPX_DONEI		40
> +#define MT6360_BAT_OVP_ADC_EVT		41
> +#define MT6360_TYPEC_OTP_EVT		42
> +#define MT6360_ADC_WAKEUP_EVT		43
> +#define MT6360_ADC_DONEI		44
> +#define MT6360_BST_BATUVI		45
> +#define MT6360_BST_VBUSOVI		46
> +#define MT6360_BST_OLPI			47
>   /* REG 6 -> 48 ~ 55 */
> -#define MT6360_ATTACH_I			(48)
> -#define MT6360_DETACH_I			(49)
> -#define MT6360_QC30_STPDONE		(51)
> -#define MT6360_QC_VBUSDET_DONE		(52)
> -#define MT6360_HVDCP_DET		(53)
> -#define MT6360_CHGDETI			(54)
> -#define MT6360_DCDTI			(55)
> +#define MT6360_ATTACH_I			48
> +#define MT6360_DETACH_I			49
> +#define MT6360_QC30_STPDONE		51
> +#define MT6360_QC_VBUSDET_DONE		52
> +#define MT6360_HVDCP_DET		53
> +#define MT6360_CHGDETI			54
> +#define MT6360_DCDTI			55
>   /* REG 7 -> 56 ~ 63 */
> -#define MT6360_FOD_DONE_EVT		(56)
> -#define MT6360_FOD_OV_EVT		(57)
> -#define MT6360_CHRDET_UVP_EVT		(58)
> -#define MT6360_CHRDET_OVP_EVT		(59)
> -#define MT6360_CHRDET_EXT_EVT		(60)
> -#define MT6360_FOD_LR_EVT		(61)
> -#define MT6360_FOD_HR_EVT		(62)
> -#define MT6360_FOD_DISCHG_FAIL_EVT	(63)
> +#define MT6360_FOD_DONE_EVT		56
> +#define MT6360_FOD_OV_EVT		57
> +#define MT6360_CHRDET_UVP_EVT		58
> +#define MT6360_CHRDET_OVP_EVT		59
> +#define MT6360_CHRDET_EXT_EVT		60
> +#define MT6360_FOD_LR_EVT		61
> +#define MT6360_FOD_HR_EVT		62
> +#define MT6360_FOD_DISCHG_FAIL_EVT	63
>   /* REG 8 -> 64 ~ 71 */
> -#define MT6360_USBID_EVT		(64)
> -#define MT6360_APWDTRST_EVT		(65)
> -#define MT6360_EN_EVT			(66)
> -#define MT6360_QONB_RST_EVT		(67)
> -#define MT6360_MRSTB_EVT		(68)
> -#define MT6360_OTP_EVT			(69)
> -#define MT6360_VDDAOV_EVT		(70)
> -#define MT6360_SYSUV_EVT		(71)
> +#define MT6360_USBID_EVT		64
> +#define MT6360_APWDTRST_EVT		65
> +#define MT6360_EN_EVT			66
> +#define MT6360_QONB_RST_EVT		67
> +#define MT6360_MRSTB_EVT		68
> +#define MT6360_OTP_EVT			69
> +#define MT6360_VDDAOV_EVT		70
> +#define MT6360_SYSUV_EVT		71
>   /* REG 9 -> 72 ~ 79 */
> -#define MT6360_FLED_STRBPIN_EVT		(72)
> -#define MT6360_FLED_TORPIN_EVT		(73)
> -#define MT6360_FLED_TX_EVT		(74)
> -#define MT6360_FLED_LVF_EVT		(75)
> -#define MT6360_FLED2_SHORT_EVT		(78)
> -#define MT6360_FLED1_SHORT_EVT		(79)
> +#define MT6360_FLED_STRBPIN_EVT		72
> +#define MT6360_FLED_TORPIN_EVT		73
> +#define MT6360_FLED_TX_EVT		74
> +#define MT6360_FLED_LVF_EVT		75
> +#define MT6360_FLED2_SHORT_EVT		78
> +#define MT6360_FLED1_SHORT_EVT		79
>   /* REG 10 -> 80 ~ 87 */
> -#define MT6360_FLED2_STRB_EVT		(80)
> -#define MT6360_FLED1_STRB_EVT		(81)
> -#define MT6360_FLED2_STRB_TO_EVT	(82)
> -#define MT6360_FLED1_STRB_TO_EVT	(83)
> -#define MT6360_FLED2_TOR_EVT		(84)
> -#define MT6360_FLED1_TOR_EVT		(85)
> +#define MT6360_FLED2_STRB_EVT		80
> +#define MT6360_FLED1_STRB_EVT		81
> +#define MT6360_FLED2_STRB_TO_EVT	82
> +#define MT6360_FLED1_STRB_TO_EVT	83
> +#define MT6360_FLED2_TOR_EVT		84
> +#define MT6360_FLED1_TOR_EVT		85
>   /* REG 11 -> 88 ~ 95 */
>   /* REG 12 -> 96 ~ 103 */
> -#define MT6360_BUCK1_PGB_EVT		(96)
> -#define MT6360_BUCK1_OC_EVT		(100)
> -#define MT6360_BUCK1_OV_EVT		(101)
> -#define MT6360_BUCK1_UV_EVT		(102)
> +#define MT6360_BUCK1_PGB_EVT		96
> +#define MT6360_BUCK1_OC_EVT		100
> +#define MT6360_BUCK1_OV_EVT		101
> +#define MT6360_BUCK1_UV_EVT		102
>   /* REG 13 -> 104 ~ 111 */
> -#define MT6360_BUCK2_PGB_EVT		(104)
> -#define MT6360_BUCK2_OC_EVT		(108)
> -#define MT6360_BUCK2_OV_EVT		(109)
> -#define MT6360_BUCK2_UV_EVT		(110)
> +#define MT6360_BUCK2_PGB_EVT		104
> +#define MT6360_BUCK2_OC_EVT		108
> +#define MT6360_BUCK2_OV_EVT		109
> +#define MT6360_BUCK2_UV_EVT		110
>   /* REG 14 -> 112 ~ 119 */
> -#define MT6360_LDO1_OC_EVT		(113)
> -#define MT6360_LDO2_OC_EVT		(114)
> -#define MT6360_LDO3_OC_EVT		(115)
> -#define MT6360_LDO5_OC_EVT		(117)
> -#define MT6360_LDO6_OC_EVT		(118)
> -#define MT6360_LDO7_OC_EVT		(119)
> +#define MT6360_LDO1_OC_EVT		113
> +#define MT6360_LDO2_OC_EVT		114
> +#define MT6360_LDO3_OC_EVT		115
> +#define MT6360_LDO5_OC_EVT		117
> +#define MT6360_LDO6_OC_EVT		118
> +#define MT6360_LDO7_OC_EVT		119
>   /* REG 15 -> 120 ~ 127 */
> -#define MT6360_LDO1_PGB_EVT		(121)
> -#define MT6360_LDO2_PGB_EVT		(122)
> -#define MT6360_LDO3_PGB_EVT		(123)
> -#define MT6360_LDO5_PGB_EVT		(125)
> -#define MT6360_LDO6_PGB_EVT		(126)
> -#define MT6360_LDO7_PGB_EVT		(127)
> -
> -static const struct regmap_irq mt6360_pmu_irqs[] =  {
> +#define MT6360_LDO1_PGB_EVT		121
> +#define MT6360_LDO2_PGB_EVT		122
> +#define MT6360_LDO3_PGB_EVT		123
> +#define MT6360_LDO5_PGB_EVT		125
> +#define MT6360_LDO6_PGB_EVT		126
> +#define MT6360_LDO7_PGB_EVT		127
> +
> +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),
> @@ -211,15 +210,15 @@ static const struct regmap_irq mt6360_pmu_irqs[] =  {
>   
>   static int mt6360_pmu_handle_post_irq(void *irq_drv_data)
>   {
> -	struct mt6360_pmu_data *mpd = irq_drv_data;
> +	struct mt6360_data *data = irq_drv_data;
>   
> -	return regmap_update_bits(mpd->regmap,
> +	return regmap_update_bits(data->regmap,
>   		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,
> @@ -266,7 +265,7 @@ static const struct resource mt6360_led_resources[] = {
>   	DEFINE_RES_IRQ_NAMED(MT6360_FLED1_STRB_TO_EVT, "fled1_strb_to_evt"),
>   };
>   
> -static const struct resource mt6360_pmic_resources[] = {
> +static const struct resource mt6360_regulator_resources[] = {
>   	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_PGB_EVT, "buck1_pgb_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OC_EVT, "buck1_oc_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OV_EVT, "buck1_ov_evt"),
> @@ -279,9 +278,6 @@ static const struct resource mt6360_pmic_resources[] = {
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"),
> -};
> -
> -static const struct resource mt6360_ldo_resources[] = {
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO1_OC_EVT, "ldo1_oc_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO2_OC_EVT, "ldo2_oc_evt"),
>   	DEFINE_RES_IRQ_NAMED(MT6360_LDO3_OC_EVT, "ldo3_oc_evt"),
> @@ -293,18 +289,16 @@ static const struct resource mt6360_ldo_resources[] = {
>   };
>   
>   static const struct mfd_cell mt6360_devs[] = {
> -	OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
> -		    NULL, 0, 0, "mediatek,mt6360_adc"),
> -	OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
> -		    NULL, 0, 0, "mediatek,mt6360_chg"),
> -	OF_MFD_CELL("mt6360_led", mt6360_led_resources,
> -		    NULL, 0, 0, "mediatek,mt6360_led"),
> -	OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
> -		    NULL, 0, 0, "mediatek,mt6360_pmic"),
> -	OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
> -		    NULL, 0, 0, "mediatek,mt6360_ldo"),
> -	OF_MFD_CELL("mt6360_tcpc", NULL,
> -		    NULL, 0, 0, "mediatek,mt6360_tcpc"),
> +	OF_MFD_CELL("mt6360-adc", mt6360_adc_resources,
> +		    NULL, 0, 0, "mediatek,mt6360-adc"),
> +	OF_MFD_CELL("mt6360-chg", mt6360_chg_resources,
> +		    NULL, 0, 0, "mediatek,mt6360-chg"),
> +	OF_MFD_CELL("mt6360-led", mt6360_led_resources,
> +		    NULL, 0, 0, "mediatek,mt6360-led"),
> +	OF_MFD_CELL("mt6360-regulator", mt6360_regulator_resources,
> +		    NULL, 0, 0, "mediatek,mt6360-regulator"),
> +	OF_MFD_CELL("mt6360-tcpc", NULL,
> +		    NULL, 0, 0, "mediatek,mt6360-tcpc"),
>   };
>   
>   static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
> @@ -314,63 +308,63 @@ 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_pmu_data *mpd;
> +	struct mt6360_data *data;
>   	unsigned int reg_data;
>   	int i, ret;
>   
> -	mpd = devm_kzalloc(&client->dev, sizeof(*mpd), GFP_KERNEL);
> -	if (!mpd)
> +	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
> +	if (!data)
>   		return -ENOMEM;
>   
> -	mpd->dev = &client->dev;
> -	i2c_set_clientdata(client, mpd);
> +	data->dev = &client->dev;
> +	i2c_set_clientdata(client, data);
>   
> -	mpd->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
> -	if (IS_ERR(mpd->regmap)) {
> +	data->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
> +	if (IS_ERR(data->regmap)) {
>   		dev_err(&client->dev, "Failed to register regmap\n");
> -		return PTR_ERR(mpd->regmap);
> +		return PTR_ERR(data->regmap);
>   	}
>   
> -	ret = regmap_read(mpd->regmap, MT6360_PMU_DEV_INFO, &reg_data);
> +	ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, &reg_data);
>   	if (ret) {
>   		dev_err(&client->dev, "Device not found\n");
>   		return ret;
>   	}
>   
> -	mpd->chip_rev = reg_data & CHIP_REV_MASK;
> -	if (mpd->chip_rev != CHIP_VEN_MT6360) {
> +	data->chip_rev = reg_data & CHIP_REV_MASK;
> +	if (data->chip_rev != CHIP_VEN_MT6360) {
>   		dev_err(&client->dev, "Device not supported\n");
>   		return -ENODEV;
>   	}
>   
> -	mt6360_pmu_irq_chip.irq_drv_data = mpd;
> -	ret = devm_regmap_add_irq_chip(&client->dev, mpd->regmap, client->irq,
> +	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, &mpd->irq_data);
> +				       &mt6360_irq_chip, &data->irq_data);
>   	if (ret) {
>   		dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
>   		return ret;
>   	}
>   
> -	mpd->i2c[0] = client;
> +	data->i2c[0] = client;
>   	for (i = 1; i < MT6360_SLAVE_MAX; i++) {
> -		mpd->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
> +		data->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
>   							client->adapter,
>   							mt6360_slave_addr[i]);
> -		if (IS_ERR(mpd->i2c[i])) {
> +		if (IS_ERR(data->i2c[i])) {
>   			dev_err(&client->dev,
>   				"Failed to get new dummy I2C device for address 0x%x",
>   				mt6360_slave_addr[i]);
> -			return PTR_ERR(mpd->i2c[i]);
> +			return PTR_ERR(data->i2c[i]);
>   		}
> -		i2c_set_clientdata(mpd->i2c[i], mpd);
> +		i2c_set_clientdata(data->i2c[i], data);
>   	}
>   
>   	ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_AUTO,
>   				   mt6360_devs, ARRAY_SIZE(mt6360_devs), NULL,
> -				   0, regmap_irq_get_domain(mpd->irq_data));
> +				   0, regmap_irq_get_domain(data->irq_data));
>   	if (ret) {
>   		dev_err(&client->dev,
>   			"Failed to register subordinate devices\n");
> @@ -380,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);
>   
> @@ -390,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);
> @@ -401,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");
> diff --git a/include/linux/mfd/mt6360.h b/include/linux/mfd/mt6360.h
> index ea13040..76077e4 100644
> --- a/include/linux/mfd/mt6360.h
> +++ b/include/linux/mfd/mt6360.h
> @@ -21,7 +21,7 @@ enum {
>   #define MT6360_LDO_SLAVEID	(0x64)
>   #define MT6360_TCPC_SLAVEID	(0x4E)
>   
> -struct mt6360_pmu_data {
> +struct mt6360_data {
>   	struct i2c_client *i2c[MT6360_SLAVE_MAX];
>   	struct device *dev;
>   	struct regmap *regmap;
>
Lee Jones July 13, 2020, 6:51 a.m. UTC | #2 
On Fri, 10 Jul 2020, Matthias Brugger wrote:

> 
> 
> On 07/07/2020 12:30, Gene Chen wrote:
> > From: Gene Chen <gene_chen@richtek.com>
> > 
> > Rearrange include file.
> > Remove brackets around raw numbers.
> > Indicate sub-dev compatible name by using "-"
> > Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > Rename mt6360_pmu_data by mt6360_data.
> > Rename mt6360_pmu by mt6360.
> 
> That seems like a lot of cosmetics. Why is this needed?
> If you think that's needed it should be split up in different commits, each
> explaining in the commit message why you do that.

Agreed.  This set is still not broken up enough.

Please place each logical change into its own patch for review.
Gene Chen July 13, 2020, 10:35 a.m. UTC | #3 
Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午2:51寫道：
>
> On Fri, 10 Jul 2020, Matthias Brugger wrote:
>
> >
> >
> > On 07/07/2020 12:30, Gene Chen wrote:
> > > From: Gene Chen <gene_chen@richtek.com>
> > >
> > > Rearrange include file.
> > > Remove brackets around raw numbers.
> > > Indicate sub-dev compatible name by using "-"
> > > Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > > Rename mt6360_pmu_data by mt6360_data.
> > > Rename mt6360_pmu by mt6360.
> >
> > That seems like a lot of cosmetics. Why is this needed?
> > If you think that's needed it should be split up in different commits, each
> > explaining in the commit message why you do that.
>
> Agreed.  This set is still not broken up enough.
>
> Please place each logical change into its own patch for review.
>

1. Rearrange include file.
After check serveral file about coding style, include file seems sort
by architecture, not by alphabet
2. Remove brackets around raw numbers.
Due to redundant brackets, another reviewer recommended to delete them.
3. Indicate sub-dev compatible name by using "-"
Suggestion by Lees when review mfd binding document.
4. Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
Simplify the similar resources object.
5. Rename mt6360_pmu_data by mt6360_data.
Not only include pmu part, but also entire MT6360 IC.
6. Rename mt6360_pmu by mt6360.
Same reason as above.

We try to make code more simpler and easier to understand
We can also discard changes if patch 1,2,4,5,6 doesn't make any difference.

> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
Lee Jones July 13, 2020, 10:48 a.m. UTC | #4 
On Mon, 13 Jul 2020, Gene Chen wrote:

> Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午2:51寫道：
> >
> > On Fri, 10 Jul 2020, Matthias Brugger wrote:
> >
> > >
> > >
> > > On 07/07/2020 12:30, Gene Chen wrote:
> > > > From: Gene Chen <gene_chen@richtek.com>
> > > >
> > > > Rearrange include file.
> > > > Remove brackets around raw numbers.
> > > > Indicate sub-dev compatible name by using "-"
> > > > Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > > > Rename mt6360_pmu_data by mt6360_data.
> > > > Rename mt6360_pmu by mt6360.
> > >
> > > That seems like a lot of cosmetics. Why is this needed?
> > > If you think that's needed it should be split up in different commits, each
> > > explaining in the commit message why you do that.
> >
> > Agreed.  This set is still not broken up enough.
> >
> > Please place each logical change into its own patch for review.
> >
> 
> 1. Rearrange include file.
> After check serveral file about coding style, include file seems sort
> by architecture, not by alphabet
> 2. Remove brackets around raw numbers.
> Due to redundant brackets, another reviewer recommended to delete them.
> 3. Indicate sub-dev compatible name by using "-"
> Suggestion by Lees when review mfd binding document.
> 4. Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> Simplify the similar resources object.
> 5. Rename mt6360_pmu_data by mt6360_data.
> Not only include pmu part, but also entire MT6360 IC.
> 6. Rename mt6360_pmu by mt6360.
> Same reason as above.
> 
> We try to make code more simpler and easier to understand
> We can also discard changes if patch 1,2,4,5,6 doesn't make any difference.

I'm not sure what you're trying to say.

Please place each on of these changes into their own patch.
Gene Chen July 16, 2020, 10:12 a.m. UTC | #5 
Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午6:48寫道：
>
> On Mon, 13 Jul 2020, Gene Chen wrote:
>
> > Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午2:51寫道：
> > >
> > > On Fri, 10 Jul 2020, Matthias Brugger wrote:
> > >
> > > >
> > > >
> > > > On 07/07/2020 12:30, Gene Chen wrote:
> > > > > From: Gene Chen <gene_chen@richtek.com>
> > > > >
> > > > > Rearrange include file.
> > > > > Remove brackets around raw numbers.
> > > > > Indicate sub-dev compatible name by using "-"
> > > > > Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > > > > Rename mt6360_pmu_data by mt6360_data.
> > > > > Rename mt6360_pmu by mt6360.
> > > >
> > > > That seems like a lot of cosmetics. Why is this needed?
> > > > If you think that's needed it should be split up in different commits, each
> > > > explaining in the commit message why you do that.
> > >
> > > Agreed.  This set is still not broken up enough.
> > >
> > > Please place each logical change into its own patch for review.
> > >
> >
> > 1. Rearrange include file.
> > After check serveral file about coding style, include file seems sort
> > by architecture, not by alphabet
> > 2. Remove brackets around raw numbers.
> > Due to redundant brackets, another reviewer recommended to delete them.
> > 3. Indicate sub-dev compatible name by using "-"
> > Suggestion by Lees when review mfd binding document.
> > 4. Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > Simplify the similar resources object.
> > 5. Rename mt6360_pmu_data by mt6360_data.
> > Not only include pmu part, but also entire MT6360 IC.
> > 6. Rename mt6360_pmu by mt6360.
> > Same reason as above.
> >
> > We try to make code more simpler and easier to understand
> > We can also discard changes if patch 1,2,4,5,6 doesn't make any difference.
>
> I'm not sure what you're trying to say.
>
> Please place each on of these changes into their own patch.
>

I list all topic and reason why we want to modify.
Before split into patches, can we discuss which topic reviewer can accept?
or I need fix first?

> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
Lee Jones July 16, 2020, 1:44 p.m. UTC | #6 
On Thu, 16 Jul 2020, Gene Chen wrote:

> Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午6:48寫道：
> >
> > On Mon, 13 Jul 2020, Gene Chen wrote:
> >
> > > Lee Jones <lee.jones@linaro.org> 於 2020年7月13日 週一 下午2:51寫道：
> > > >
> > > > On Fri, 10 Jul 2020, Matthias Brugger wrote:
> > > >
> > > > >
> > > > >
> > > > > On 07/07/2020 12:30, Gene Chen wrote:
> > > > > > From: Gene Chen <gene_chen@richtek.com>
> > > > > >
> > > > > > Rearrange include file.
> > > > > > Remove brackets around raw numbers.
> > > > > > Indicate sub-dev compatible name by using "-"
> > > > > > Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > > > > > Rename mt6360_pmu_data by mt6360_data.
> > > > > > Rename mt6360_pmu by mt6360.
> > > > >
> > > > > That seems like a lot of cosmetics. Why is this needed?
> > > > > If you think that's needed it should be split up in different commits, each
> > > > > explaining in the commit message why you do that.
> > > >
> > > > Agreed.  This set is still not broken up enough.
> > > >
> > > > Please place each logical change into its own patch for review.
> > > >
> > >
> > > 1. Rearrange include file.
> > > After check serveral file about coding style, include file seems sort
> > > by architecture, not by alphabet
> > > 2. Remove brackets around raw numbers.
> > > Due to redundant brackets, another reviewer recommended to delete them.
> > > 3. Indicate sub-dev compatible name by using "-"
> > > Suggestion by Lees when review mfd binding document.
> > > 4. Combine mt6360 pmic/ldo resouces into mt6360 regulator resources.
> > > Simplify the similar resources object.
> > > 5. Rename mt6360_pmu_data by mt6360_data.
> > > Not only include pmu part, but also entire MT6360 IC.
> > > 6. Rename mt6360_pmu by mt6360.
> > > Same reason as above.
> > >
> > > We try to make code more simpler and easier to understand
> > > We can also discard changes if patch 1,2,4,5,6 doesn't make any difference.
> >
> > I'm not sure what you're trying to say.
> >
> > Please place each on of these changes into their own patch.
> >
> 
> I list all topic and reason why we want to modify.
> Before split into patches, can we discuss which topic reviewer can accept?
> or I need fix first?

Fix first please.
diff mbox series

Patch

diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index e9cacc2..5dfc13e 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -5,122 +5,121 @@ 
  * Author: Gene Chen <gene_chen@richtek.com>
  */
 
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/init.h>
+#include <linux/crc8.h>
+#include <linux/slab.h>
+#include <linux/regmap.h>
 #include <linux/interrupt.h>
-#include <linux/kernel.h>
 #include <linux/mfd/core.h>
-#include <linux/module.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
-#include <linux/version.h>
 
 #include <linux/mfd/mt6360.h>
 
 /* reg 0 -> 0 ~ 7 */
-#define MT6360_CHG_TREG_EVT		(4)
-#define MT6360_CHG_AICR_EVT		(5)
-#define MT6360_CHG_MIVR_EVT		(6)
-#define MT6360_PWR_RDY_EVT		(7)
+#define MT6360_CHG_TREG_EVT		4
+#define MT6360_CHG_AICR_EVT		5
+#define MT6360_CHG_MIVR_EVT		6
+#define MT6360_PWR_RDY_EVT		7
 /* REG 1 -> 8 ~ 15 */
-#define MT6360_CHG_BATSYSUV_EVT		(9)
-#define MT6360_FLED_CHG_VINOVP_EVT	(11)
-#define MT6360_CHG_VSYSUV_EVT		(12)
-#define MT6360_CHG_VSYSOV_EVT		(13)
-#define MT6360_CHG_VBATOV_EVT		(14)
-#define MT6360_CHG_VBUSOV_EVT		(15)
+#define MT6360_CHG_BATSYSUV_EVT		9
+#define MT6360_FLED_CHG_VINOVP_EVT	11
+#define MT6360_CHG_VSYSUV_EVT		12
+#define MT6360_CHG_VSYSOV_EVT		13
+#define MT6360_CHG_VBATOV_EVT		14
+#define MT6360_CHG_VBUSOV_EVT		15
 /* REG 2 -> 16 ~ 23 */
 /* REG 3 -> 24 ~ 31 */
-#define MT6360_WD_PMU_DET		(25)
-#define MT6360_WD_PMU_DONE		(26)
-#define MT6360_CHG_TMRI			(27)
-#define MT6360_CHG_ADPBADI		(29)
-#define MT6360_CHG_RVPI			(30)
-#define MT6360_OTPI			(31)
+#define MT6360_WD_PMU_DET		25
+#define MT6360_WD_PMU_DONE		26
+#define MT6360_CHG_TMRI			27
+#define MT6360_CHG_ADPBADI		29
+#define MT6360_CHG_RVPI			30
+#define MT6360_OTPI			31
 /* REG 4 -> 32 ~ 39 */
-#define MT6360_CHG_AICCMEASL		(32)
-#define MT6360_CHGDET_DONEI		(34)
-#define MT6360_WDTMRI			(35)
-#define MT6360_SSFINISHI		(36)
-#define MT6360_CHG_RECHGI		(37)
-#define MT6360_CHG_TERMI		(38)
-#define MT6360_CHG_IEOCI		(39)
+#define MT6360_CHG_AICCMEASL		32
+#define MT6360_CHGDET_DONEI		34
+#define MT6360_WDTMRI			35
+#define MT6360_SSFINISHI		36
+#define MT6360_CHG_RECHGI		37
+#define MT6360_CHG_TERMI		38
+#define MT6360_CHG_IEOCI		39
 /* REG 5 -> 40 ~ 47 */
-#define MT6360_PUMPX_DONEI		(40)
-#define MT6360_BAT_OVP_ADC_EVT		(41)
-#define MT6360_TYPEC_OTP_EVT		(42)
-#define MT6360_ADC_WAKEUP_EVT		(43)
-#define MT6360_ADC_DONEI		(44)
-#define MT6360_BST_BATUVI		(45)
-#define MT6360_BST_VBUSOVI		(46)
-#define MT6360_BST_OLPI			(47)
+#define MT6360_PUMPX_DONEI		40
+#define MT6360_BAT_OVP_ADC_EVT		41
+#define MT6360_TYPEC_OTP_EVT		42
+#define MT6360_ADC_WAKEUP_EVT		43
+#define MT6360_ADC_DONEI		44
+#define MT6360_BST_BATUVI		45
+#define MT6360_BST_VBUSOVI		46
+#define MT6360_BST_OLPI			47
 /* REG 6 -> 48 ~ 55 */
-#define MT6360_ATTACH_I			(48)
-#define MT6360_DETACH_I			(49)
-#define MT6360_QC30_STPDONE		(51)
-#define MT6360_QC_VBUSDET_DONE		(52)
-#define MT6360_HVDCP_DET		(53)
-#define MT6360_CHGDETI			(54)
-#define MT6360_DCDTI			(55)
+#define MT6360_ATTACH_I			48
+#define MT6360_DETACH_I			49
+#define MT6360_QC30_STPDONE		51
+#define MT6360_QC_VBUSDET_DONE		52
+#define MT6360_HVDCP_DET		53
+#define MT6360_CHGDETI			54
+#define MT6360_DCDTI			55
 /* REG 7 -> 56 ~ 63 */
-#define MT6360_FOD_DONE_EVT		(56)
-#define MT6360_FOD_OV_EVT		(57)
-#define MT6360_CHRDET_UVP_EVT		(58)
-#define MT6360_CHRDET_OVP_EVT		(59)
-#define MT6360_CHRDET_EXT_EVT		(60)
-#define MT6360_FOD_LR_EVT		(61)
-#define MT6360_FOD_HR_EVT		(62)
-#define MT6360_FOD_DISCHG_FAIL_EVT	(63)
+#define MT6360_FOD_DONE_EVT		56
+#define MT6360_FOD_OV_EVT		57
+#define MT6360_CHRDET_UVP_EVT		58
+#define MT6360_CHRDET_OVP_EVT		59
+#define MT6360_CHRDET_EXT_EVT		60
+#define MT6360_FOD_LR_EVT		61
+#define MT6360_FOD_HR_EVT		62
+#define MT6360_FOD_DISCHG_FAIL_EVT	63
 /* REG 8 -> 64 ~ 71 */
-#define MT6360_USBID_EVT		(64)
-#define MT6360_APWDTRST_EVT		(65)
-#define MT6360_EN_EVT			(66)
-#define MT6360_QONB_RST_EVT		(67)
-#define MT6360_MRSTB_EVT		(68)
-#define MT6360_OTP_EVT			(69)
-#define MT6360_VDDAOV_EVT		(70)
-#define MT6360_SYSUV_EVT		(71)
+#define MT6360_USBID_EVT		64
+#define MT6360_APWDTRST_EVT		65
+#define MT6360_EN_EVT			66
+#define MT6360_QONB_RST_EVT		67
+#define MT6360_MRSTB_EVT		68
+#define MT6360_OTP_EVT			69
+#define MT6360_VDDAOV_EVT		70
+#define MT6360_SYSUV_EVT		71
 /* REG 9 -> 72 ~ 79 */
-#define MT6360_FLED_STRBPIN_EVT		(72)
-#define MT6360_FLED_TORPIN_EVT		(73)
-#define MT6360_FLED_TX_EVT		(74)
-#define MT6360_FLED_LVF_EVT		(75)
-#define MT6360_FLED2_SHORT_EVT		(78)
-#define MT6360_FLED1_SHORT_EVT		(79)
+#define MT6360_FLED_STRBPIN_EVT		72
+#define MT6360_FLED_TORPIN_EVT		73
+#define MT6360_FLED_TX_EVT		74
+#define MT6360_FLED_LVF_EVT		75
+#define MT6360_FLED2_SHORT_EVT		78
+#define MT6360_FLED1_SHORT_EVT		79
 /* REG 10 -> 80 ~ 87 */
-#define MT6360_FLED2_STRB_EVT		(80)
-#define MT6360_FLED1_STRB_EVT		(81)
-#define MT6360_FLED2_STRB_TO_EVT	(82)
-#define MT6360_FLED1_STRB_TO_EVT	(83)
-#define MT6360_FLED2_TOR_EVT		(84)
-#define MT6360_FLED1_TOR_EVT		(85)
+#define MT6360_FLED2_STRB_EVT		80
+#define MT6360_FLED1_STRB_EVT		81
+#define MT6360_FLED2_STRB_TO_EVT	82
+#define MT6360_FLED1_STRB_TO_EVT	83
+#define MT6360_FLED2_TOR_EVT		84
+#define MT6360_FLED1_TOR_EVT		85
 /* REG 11 -> 88 ~ 95 */
 /* REG 12 -> 96 ~ 103 */
-#define MT6360_BUCK1_PGB_EVT		(96)
-#define MT6360_BUCK1_OC_EVT		(100)
-#define MT6360_BUCK1_OV_EVT		(101)
-#define MT6360_BUCK1_UV_EVT		(102)
+#define MT6360_BUCK1_PGB_EVT		96
+#define MT6360_BUCK1_OC_EVT		100
+#define MT6360_BUCK1_OV_EVT		101
+#define MT6360_BUCK1_UV_EVT		102
 /* REG 13 -> 104 ~ 111 */
-#define MT6360_BUCK2_PGB_EVT		(104)
-#define MT6360_BUCK2_OC_EVT		(108)
-#define MT6360_BUCK2_OV_EVT		(109)
-#define MT6360_BUCK2_UV_EVT		(110)
+#define MT6360_BUCK2_PGB_EVT		104
+#define MT6360_BUCK2_OC_EVT		108
+#define MT6360_BUCK2_OV_EVT		109
+#define MT6360_BUCK2_UV_EVT		110
 /* REG 14 -> 112 ~ 119 */
-#define MT6360_LDO1_OC_EVT		(113)
-#define MT6360_LDO2_OC_EVT		(114)
-#define MT6360_LDO3_OC_EVT		(115)
-#define MT6360_LDO5_OC_EVT		(117)
-#define MT6360_LDO6_OC_EVT		(118)
-#define MT6360_LDO7_OC_EVT		(119)
+#define MT6360_LDO1_OC_EVT		113
+#define MT6360_LDO2_OC_EVT		114
+#define MT6360_LDO3_OC_EVT		115
+#define MT6360_LDO5_OC_EVT		117
+#define MT6360_LDO6_OC_EVT		118
+#define MT6360_LDO7_OC_EVT		119
 /* REG 15 -> 120 ~ 127 */
-#define MT6360_LDO1_PGB_EVT		(121)
-#define MT6360_LDO2_PGB_EVT		(122)
-#define MT6360_LDO3_PGB_EVT		(123)
-#define MT6360_LDO5_PGB_EVT		(125)
-#define MT6360_LDO6_PGB_EVT		(126)
-#define MT6360_LDO7_PGB_EVT		(127)
-
-static const struct regmap_irq mt6360_pmu_irqs[] =  {
+#define MT6360_LDO1_PGB_EVT		121
+#define MT6360_LDO2_PGB_EVT		122
+#define MT6360_LDO3_PGB_EVT		123
+#define MT6360_LDO5_PGB_EVT		125
+#define MT6360_LDO6_PGB_EVT		126
+#define MT6360_LDO7_PGB_EVT		127
+
+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),
@@ -211,15 +210,15 @@  static const struct regmap_irq mt6360_pmu_irqs[] =  {
 
 static int mt6360_pmu_handle_post_irq(void *irq_drv_data)
 {
-	struct mt6360_pmu_data *mpd = irq_drv_data;
+	struct mt6360_data *data = irq_drv_data;
 
-	return regmap_update_bits(mpd->regmap,
+	return regmap_update_bits(data->regmap,
 		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,
@@ -266,7 +265,7 @@  static const struct resource mt6360_led_resources[] = {
 	DEFINE_RES_IRQ_NAMED(MT6360_FLED1_STRB_TO_EVT, "fled1_strb_to_evt"),
 };
 
-static const struct resource mt6360_pmic_resources[] = {
+static const struct resource mt6360_regulator_resources[] = {
 	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_PGB_EVT, "buck1_pgb_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OC_EVT, "buck1_oc_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OV_EVT, "buck1_ov_evt"),
@@ -279,9 +278,6 @@  static const struct resource mt6360_pmic_resources[] = {
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"),
-};
-
-static const struct resource mt6360_ldo_resources[] = {
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO1_OC_EVT, "ldo1_oc_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO2_OC_EVT, "ldo2_oc_evt"),
 	DEFINE_RES_IRQ_NAMED(MT6360_LDO3_OC_EVT, "ldo3_oc_evt"),
@@ -293,18 +289,16 @@  static const struct resource mt6360_ldo_resources[] = {
 };
 
 static const struct mfd_cell mt6360_devs[] = {
-	OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
-		    NULL, 0, 0, "mediatek,mt6360_adc"),
-	OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
-		    NULL, 0, 0, "mediatek,mt6360_chg"),
-	OF_MFD_CELL("mt6360_led", mt6360_led_resources,
-		    NULL, 0, 0, "mediatek,mt6360_led"),
-	OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
-		    NULL, 0, 0, "mediatek,mt6360_pmic"),
-	OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
-		    NULL, 0, 0, "mediatek,mt6360_ldo"),
-	OF_MFD_CELL("mt6360_tcpc", NULL,
-		    NULL, 0, 0, "mediatek,mt6360_tcpc"),
+	OF_MFD_CELL("mt6360-adc", mt6360_adc_resources,
+		    NULL, 0, 0, "mediatek,mt6360-adc"),
+	OF_MFD_CELL("mt6360-chg", mt6360_chg_resources,
+		    NULL, 0, 0, "mediatek,mt6360-chg"),
+	OF_MFD_CELL("mt6360-led", mt6360_led_resources,
+		    NULL, 0, 0, "mediatek,mt6360-led"),
+	OF_MFD_CELL("mt6360-regulator", mt6360_regulator_resources,
+		    NULL, 0, 0, "mediatek,mt6360-regulator"),
+	OF_MFD_CELL("mt6360-tcpc", NULL,
+		    NULL, 0, 0, "mediatek,mt6360-tcpc"),
 };
 
 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
@@ -314,63 +308,63 @@  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_pmu_data *mpd;
+	struct mt6360_data *data;
 	unsigned int reg_data;
 	int i, ret;
 
-	mpd = devm_kzalloc(&client->dev, sizeof(*mpd), GFP_KERNEL);
-	if (!mpd)
+	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
 		return -ENOMEM;
 
-	mpd->dev = &client->dev;
-	i2c_set_clientdata(client, mpd);
+	data->dev = &client->dev;
+	i2c_set_clientdata(client, data);
 
-	mpd->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
-	if (IS_ERR(mpd->regmap)) {
+	data->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
+	if (IS_ERR(data->regmap)) {
 		dev_err(&client->dev, "Failed to register regmap\n");
-		return PTR_ERR(mpd->regmap);
+		return PTR_ERR(data->regmap);
 	}
 
-	ret = regmap_read(mpd->regmap, MT6360_PMU_DEV_INFO, &reg_data);
+	ret = regmap_read(data->regmap, MT6360_PMU_DEV_INFO, &reg_data);
 	if (ret) {
 		dev_err(&client->dev, "Device not found\n");
 		return ret;
 	}
 
-	mpd->chip_rev = reg_data & CHIP_REV_MASK;
-	if (mpd->chip_rev != CHIP_VEN_MT6360) {
+	data->chip_rev = reg_data & CHIP_REV_MASK;
+	if (data->chip_rev != CHIP_VEN_MT6360) {
 		dev_err(&client->dev, "Device not supported\n");
 		return -ENODEV;
 	}
 
-	mt6360_pmu_irq_chip.irq_drv_data = mpd;
-	ret = devm_regmap_add_irq_chip(&client->dev, mpd->regmap, client->irq,
+	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, &mpd->irq_data);
+				       &mt6360_irq_chip, &data->irq_data);
 	if (ret) {
 		dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
 		return ret;
 	}
 
-	mpd->i2c[0] = client;
+	data->i2c[0] = client;
 	for (i = 1; i < MT6360_SLAVE_MAX; i++) {
-		mpd->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
+		data->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
 							client->adapter,
 							mt6360_slave_addr[i]);
-		if (IS_ERR(mpd->i2c[i])) {
+		if (IS_ERR(data->i2c[i])) {
 			dev_err(&client->dev,
 				"Failed to get new dummy I2C device for address 0x%x",
 				mt6360_slave_addr[i]);
-			return PTR_ERR(mpd->i2c[i]);
+			return PTR_ERR(data->i2c[i]);
 		}
-		i2c_set_clientdata(mpd->i2c[i], mpd);
+		i2c_set_clientdata(data->i2c[i], data);
 	}
 
 	ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_AUTO,
 				   mt6360_devs, ARRAY_SIZE(mt6360_devs), NULL,
-				   0, regmap_irq_get_domain(mpd->irq_data));
+				   0, regmap_irq_get_domain(data->irq_data));
 	if (ret) {
 		dev_err(&client->dev,
 			"Failed to register subordinate devices\n");
@@ -380,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);
 
@@ -390,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);
@@ -401,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");
diff --git a/include/linux/mfd/mt6360.h b/include/linux/mfd/mt6360.h
index ea13040..76077e4 100644
--- a/include/linux/mfd/mt6360.h
+++ b/include/linux/mfd/mt6360.h
@@ -21,7 +21,7 @@  enum {
 #define MT6360_LDO_SLAVEID	(0x64)
 #define MT6360_TCPC_SLAVEID	(0x4E)
 
-struct mt6360_pmu_data {
+struct mt6360_data {
 	struct i2c_client *i2c[MT6360_SLAVE_MAX];
 	struct device *dev;
 	struct regmap *regmap;