mfd: mt6360: add pmic mt6360 driver
Subsystems (2)
PATCH v5 1/1 mfd: mt6360: add pmic mt6360 driver
From: Gene Chen <[email protected]>
Add mfd driver for mt6360 pmic chip include
Battery Charger/USB_PD/Flash LED/RGB LED/LDO/Buck
--- drivers/mfd/Kconfig | 12 + drivers/mfd/Makefile | 1 + drivers/mfd/mt6360-core.c | 437 +++++++++++++++++++++++++++++ include/linux/mfd/mt6360-private.h | 217 ++++++++++++++ include/linux/mfd/mt6360.h | 32 +++ 5 files changed, 699 insertions(+) create mode 100644 drivers/mfd/mt6360-core.c create mode 100644 include/linux/mfd/mt6360-private.h create mode 100644 include/linux/mfd/mt6360.h
changelogs between v1 & v2
- include missing header file
changelogs between v2 & v3
- add changelogs
changelogs between v3 & v4
- fix Kconfig description
- replace mt6360_pmu_info with mt6360_pmu_data
- replace probe with probe_new
- remove unnecessary irq_chip variable
- remove annotation
- replace MT6360_MFD_CELL with OF_MFD_CELL
changelogs between v4 & v5
- remove unnecessary parse dt function
- use devm_i2c_new_dummy_device
- add base-commit message
drivers/mfd/Kconfig +12 -0
@@ -856,6 +856,18 @@ config MFD_MAX8998 additional drivers must be enabled in order to use the functionality of the device. +config MFD_MT6360 + tristate "Mediatek MT6360 SubPMIC" + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + depends on I2C + help + Say Y here to enable MT6360 PMU/PMIC/LDO functional support. + PMU part includes Charger, Flashlight, RGB LED + PMIC part includes 2-channel BUCKs and 2-channel LDOs + LDO part includes 4-channel LDOs + config MFD_MT6397 tristate "MediaTek MT6397 PMIC Support" select MFD_CORE
drivers/mfd/Makefile +1 -0
@@ -238,6 +238,7 @@ obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_INTEL_SOC_PMIC_BXTWC) += intel_soc_pmic_bxtwc.o obj-$(CONFIG_INTEL_SOC_PMIC_CHTWC) += intel_soc_pmic_chtwc.o obj-$(CONFIG_INTEL_SOC_PMIC_CHTDC_TI) += intel_soc_pmic_chtdc_ti.o +obj-$(CONFIG_MFD_MT6360) += mt6360-core.o mt6397-objs := mt6397-core.o mt6397-irq.o obj-$(CONFIG_MFD_MT6397) += mt6397.o obj-$(CONFIG_INTEL_SOC_PMIC_MRFLD) += intel_soc_pmic_mrfld.o
drivers/mfd/mt6360-core.c new file +437 -0
437 lines not on this page · raw message
include/linux/mfd/mt6360-private.h new file +217 -0
217 lines not on this page · raw message
include/linux/mfd/mt6360.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +*/ + +#ifndef __MT6360_H__ +#define __MT6360_H__ + +#include <linux/regmap.h> + +enum { +MT6360_SLAVE_PMU =0 , +MT6360_SLAVE_PMIC , +MT6360_SLAVE_LDO , +MT6360_SLAVE_TCPC , +MT6360_SLAVE_MAX , +}; + +#define MT6360_PMU_SLAVEID (0x34) +#define MT6360_PMIC_SLAVEID (0x1A) +#define MT6360_LDO_SLAVEID (0x64) +#define MT6360_TCPC_SLAVEID (0x4E) + +struct mt6360_pmu_data { +struct i2c_client *i2c[MT6360_SLAVE_MAX ]; +struct device *dev; +struct regmap *regmap; +struct regmap_irq_chip_data *irq_data; +unsigned int chip_rev; +}; + +#endif /* __MT6360_H__ */
base-commit: 7d194c2100ad2a6dded545887d02754948ca5241
Signature · 1 line
2.23.0
kbuild test robot
build botThank you for the patch! Yet something to improve:
Hi Gene,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on 7d194c2100ad2a6dded545887d02754948ca5241]
url: https://github.com/0day-ci/linux/commits/Gene-Chen/mfd-mt6360-add-pmic-mt6360-driver/20191104-014602 base: 7d194c2100ad2a6dded545887d02754948ca5241 config: x86_64-allyesconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
If you fix the issue, kindly add following tag
All error/warnings (new ones prefixed by >>):
drivers/mfd/mt6360-core.c:298:2: error: implicit declaration of function 'OF_MFD_CELL'; did you mean 'F_OFD_SETLK'? [-Werror=implicit-function-declaration]
OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
^~~~~~~~~~~
F_OFD_SETLK
drivers/mfd/mt6360-core.c:298:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
drivers/mfd/mt6360-core.c:298:2: note: (near initialization for 'mt6360_devs[0].name')
drivers/mfd/mt6360-core.c:298:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:298:2: note: (near initialization for 'mt6360_devs[0].name')
drivers/mfd/mt6360-core.c:300:2: error: initializer element is not constant
OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:300:2: note: (near initialization for 'mt6360_devs[0].id')
drivers/mfd/mt6360-core.c:302:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_led", mt6360_led_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:302:2: note: (near initialization for 'mt6360_devs[0].usage_count')
drivers/mfd/mt6360-core.c:302:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:302:2: note: (near initialization for 'mt6360_devs[0].usage_count')
drivers/mfd/mt6360-core.c:304:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:304:2: note: (near initialization for 'mt6360_devs[0].enable')
drivers/mfd/mt6360-core.c:304:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:304:2: note: (near initialization for 'mt6360_devs[0].enable')
drivers/mfd/mt6360-core.c:306:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:306:2: note: (near initialization for 'mt6360_devs[0].disable')
drivers/mfd/mt6360-core.c:306:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:306:2: note: (near initialization for 'mt6360_devs[0].disable')
drivers/mfd/mt6360-core.c:308:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_tcpc", NULL,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:308:2: note: (near initialization for 'mt6360_devs[0].suspend')
drivers/mfd/mt6360-core.c:308:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:308:2: note: (near initialization for 'mt6360_devs[0].suspend')
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_probe':
>> drivers/mfd/mt6360-core.c:352:12: error: 'IRQF_TRIGGER_FALLING' undeclared (first use in this function); did you mean 'IRQD_TRIGGER_MASK'?
IRQF_TRIGGER_FALLING, 0,
^~~~~~~~~~~~~~~~~~~~
IRQD_TRIGGER_MASK
drivers/mfd/mt6360-core.c:352:12: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/mfd/mt6360-core.c:352:12: warning: passing argument 4 of 'devm_regmap_add_irq_chip' makes integer from pointer without a cast [-Wint-conversion]
In file included from include/linux/mfd/mt6360.h:9:0,
from drivers/mfd/mt6360-core.c:15:
include/linux/regmap.h:1270:5: note: expected 'int' but argument is of type 'const struct mfd_cell *'
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_suspend':
>> drivers/mfd/mt6360-core.c:392:3: error: implicit declaration of function 'enable_irq_wake'; did you mean 'enable_IO_APIC'? [-Werror=implicit-function-declaration]
enable_irq_wake(i2c->irq);
^~~~~~~~~~~~~~~
enable_IO_APIC
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_resume':
>> drivers/mfd/mt6360-core.c:403:3: error: implicit declaration of function 'disable_irq_wake'; did you mean 'local_irq_save'? [-Werror=implicit-function-declaration]
disable_irq_wake(i2c->irq);
^~~~~~~~~~~~~~~~
local_irq_savecc1: some warnings being treated as errors
vim +352 drivers/mfd/mt6360-core.c
296
297 static const struct mfd_cell mt6360_devs[] = {
298 OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
299 NULL, 0, 0, "mediatek,mt6360_adc"),
300 OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
301 NULL, 0, 0, "mediatek,mt6360_chg"),
302 OF_MFD_CELL("mt6360_led", mt6360_led_resources,
303 NULL, 0, 0, "mediatek,mt6360_led"),
304 OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
305 NULL, 0, 0, "mediatek,mt6360_pmic"),
> 306 OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
307 NULL, 0, 0, "mediatek,mt6360_ldo"),
> 308 OF_MFD_CELL("mt6360_tcpc", NULL,
309 NULL, 0, 0, "mediatek,mt6360_tcpc"),
310 };
311
312 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
313 MT6360_PMU_SLAVEID,
314 MT6360_PMIC_SLAVEID,
315 MT6360_LDO_SLAVEID,
316 MT6360_TCPC_SLAVEID,
317 };
318
319 static int mt6360_pmu_probe(struct i2c_client *client)
320 {
321 struct mt6360_pmu_data *mpd;
322 unsigned int reg_data = 0;
323 int i, ret;
324
325 mpd = devm_kzalloc(&client->dev, sizeof(*mpd), GFP_KERNEL);
326 if (!mpd)
327 return -ENOMEM;
328
329 mpd->dev = &client->dev;
330 i2c_set_clientdata(client, mpd);
331
332 mpd->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
333 if (IS_ERR(mpd->regmap)) {
334 dev_err(&client->dev, "Failed to register regmap\n");
335 return PTR_ERR(mpd->regmap);
336 }
337
338 ret = regmap_read(mpd->regmap, MT6360_PMU_DEV_INFO, ®_data);
339 if (ret < 0) {
340 dev_err(&client->dev, "Device not found\n");
341 return ret;
342 }
343
344 mpd->chip_rev = reg_data & CHIP_REV_MASK;
345 if (mpd->chip_rev != CHIP_VEN_MT6360) {
346 dev_err(&client->dev, "Device not supported\n");
347 return -ENODEV;
348 }
349
350 mt6360_pmu_irq_chip.irq_drv_data = mpd;
351 ret = devm_regmap_add_irq_chip(&client->dev, mpd->regmap, client->irq,
> 352 IRQF_TRIGGER_FALLING, 0,
353 &mt6360_pmu_irq_chip, &mpd->irq_data);
354 if (ret < 0) {
355 dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
356 return ret;
357 }
358
359 mpd->i2c[0] = client;
360 for (i = 1; i < MT6360_SLAVE_MAX; i++) {
361 mpd->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
362 client->adapter,
363 mt6360_slave_addr[i]);
364 if (IS_ERR(mpd->i2c[i])) {
365 dev_err(&client->dev, "new i2c dev [%d] fail\n", i);
366 return PTR_ERR(mpd->i2c[i]);
367 }
368 i2c_set_clientdata(mpd->i2c[i], mpd);
369 }
370
371 ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_AUTO,
372 mt6360_devs, ARRAY_SIZE(mt6360_devs), NULL,
373 0, regmap_irq_get_domain(mpd->irq_data));
374 if (ret < 0) {
375 dev_err(&client->dev, "mfd add cells fail\n");
376 return ret;
377 }
378
379 return 0;
380 }
381
382 static int mt6360_pmu_remove(struct i2c_client *client)
383 {
384 return 0;
385 }
386
387 static int __maybe_unused mt6360_pmu_suspend(struct device *dev)
388 {
389 struct i2c_client *i2c = to_i2c_client(dev);
390
391 if (device_may_wakeup(dev))
> 392 enable_irq_wake(i2c->irq);
393
394 return 0;
395 }
396
397 static int __maybe_unused mt6360_pmu_resume(struct device *dev)
398 {
399
400 struct i2c_client *i2c = to_i2c_client(dev);
401
402 if (device_may_wakeup(dev))
> 403 disable_irq_wake(i2c->irq); 404
405 return 0;
406 }
407
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot
build botThank you for the patch! Yet something to improve:
Hi Gene,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on 7d194c2100ad2a6dded545887d02754948ca5241]
url: https://github.com/0day-ci/linux/commits/Gene-Chen/mfd-mt6360-add-pmic-mt6360-driver/20191104-014602 base: 7d194c2100ad2a6dded545887d02754948ca5241 config: c6x-allyesconfig (attached as .config) compiler: c6x-elf-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=c6x
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
>> drivers/mfd/mt6360-core.c:298:2: error: implicit declaration of function 'OF_MFD_CELL' [-Werror=implicit-function-declaration]
OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:298:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
drivers/mfd/mt6360-core.c:298:2: note: (near initialization for 'mt6360_devs[0].name')
drivers/mfd/mt6360-core.c:298:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:298:2: note: (near initialization for 'mt6360_devs[0].name')
drivers/mfd/mt6360-core.c:300:2: error: initializer element is not constant
OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:300:2: note: (near initialization for 'mt6360_devs[0].id')
drivers/mfd/mt6360-core.c:302:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_led", mt6360_led_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:302:2: note: (near initialization for 'mt6360_devs[0].usage_count')
drivers/mfd/mt6360-core.c:302:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:302:2: note: (near initialization for 'mt6360_devs[0].usage_count')
drivers/mfd/mt6360-core.c:304:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:304:2: note: (near initialization for 'mt6360_devs[0].enable')
drivers/mfd/mt6360-core.c:304:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:304:2: note: (near initialization for 'mt6360_devs[0].enable')
drivers/mfd/mt6360-core.c:306:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:306:2: note: (near initialization for 'mt6360_devs[0].disable')
drivers/mfd/mt6360-core.c:306:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:306:2: note: (near initialization for 'mt6360_devs[0].disable')
drivers/mfd/mt6360-core.c:308:2: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
OF_MFD_CELL("mt6360_tcpc", NULL,
^~~~~~~~~~~
drivers/mfd/mt6360-core.c:308:2: note: (near initialization for 'mt6360_devs[0].suspend')
drivers/mfd/mt6360-core.c:308:2: error: initializer element is not constant
drivers/mfd/mt6360-core.c:308:2: note: (near initialization for 'mt6360_devs[0].suspend')
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_probe':
drivers/mfd/mt6360-core.c:352:12: error: 'IRQF_TRIGGER_FALLING' undeclared (first use in this function); did you mean 'IRQD_TRIGGER_MASK'?
IRQF_TRIGGER_FALLING, 0,
^~~~~~~~~~~~~~~~~~~~
IRQD_TRIGGER_MASK
drivers/mfd/mt6360-core.c:352:12: note: each undeclared identifier is reported only once for each function it appears in
drivers/mfd/mt6360-core.c:352:12: warning: passing argument 4 of 'devm_regmap_add_irq_chip' makes integer from pointer without a cast [-Wint-conversion]
In file included from include/linux/mfd/mt6360.h:9:0,
from drivers/mfd/mt6360-core.c:15:
include/linux/regmap.h:1270:5: note: expected 'int' but argument is of type 'const struct mfd_cell *'
int devm_regmap_add_irq_chip(struct device *dev, struct regmap *map, int irq,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_suspend':
>> drivers/mfd/mt6360-core.c:392:3: error: implicit declaration of function 'enable_irq_wake'; did you mean 'local_irq_save'? [-Werror=implicit-function-declaration]
enable_irq_wake(i2c->irq);
^~~~~~~~~~~~~~~
local_irq_save
drivers/mfd/mt6360-core.c: In function 'mt6360_pmu_resume':
drivers/mfd/mt6360-core.c:403:3: error: implicit declaration of function 'disable_irq_wake'; did you mean 'local_irq_save'? [-Werror=implicit-function-declaration]
disable_irq_wake(i2c->irq);
^~~~~~~~~~~~~~~~
local_irq_savecc1: some warnings being treated as errors
vim +/OF_MFD_CELL +298 drivers/mfd/mt6360-core.c
296
297 static const struct mfd_cell mt6360_devs[] = {
> 298 OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
299 NULL, 0, 0, "mediatek,mt6360_adc"),
300 OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
301 NULL, 0, 0, "mediatek,mt6360_chg"),
302 OF_MFD_CELL("mt6360_led", mt6360_led_resources,
303 NULL, 0, 0, "mediatek,mt6360_led"),
304 OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
305 NULL, 0, 0, "mediatek,mt6360_pmic"),
306 OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
307 NULL, 0, 0, "mediatek,mt6360_ldo"),
308 OF_MFD_CELL("mt6360_tcpc", NULL,
309 NULL, 0, 0, "mediatek,mt6360_tcpc"),
310 };
311
312 static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX] = {
313 MT6360_PMU_SLAVEID,
314 MT6360_PMIC_SLAVEID,
315 MT6360_LDO_SLAVEID,
316 MT6360_TCPC_SLAVEID,
317 };
318
319 static int mt6360_pmu_probe(struct i2c_client *client)
320 {
321 struct mt6360_pmu_data *mpd;
322 unsigned int reg_data = 0;
323 int i, ret;
324
325 mpd = devm_kzalloc(&client->dev, sizeof(*mpd), GFP_KERNEL);
326 if (!mpd)
327 return -ENOMEM;
328
329 mpd->dev = &client->dev;
330 i2c_set_clientdata(client, mpd);
331
332 mpd->regmap = devm_regmap_init_i2c(client, &mt6360_pmu_regmap_config);
333 if (IS_ERR(mpd->regmap)) {
334 dev_err(&client->dev, "Failed to register regmap\n");
335 return PTR_ERR(mpd->regmap);
336 }
337
338 ret = regmap_read(mpd->regmap, MT6360_PMU_DEV_INFO, ®_data);
339 if (ret < 0) {
340 dev_err(&client->dev, "Device not found\n");
341 return ret;
342 }
343
344 mpd->chip_rev = reg_data & CHIP_REV_MASK;
345 if (mpd->chip_rev != CHIP_VEN_MT6360) {
346 dev_err(&client->dev, "Device not supported\n");
347 return -ENODEV;
348 }
349
350 mt6360_pmu_irq_chip.irq_drv_data = mpd;
351 ret = devm_regmap_add_irq_chip(&client->dev, mpd->regmap, client->irq,
> 352 IRQF_TRIGGER_FALLING, 0,
353 &mt6360_pmu_irq_chip, &mpd->irq_data);
354 if (ret < 0) {
355 dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
356 return ret;
357 }
358
359 mpd->i2c[0] = client;
360 for (i = 1; i < MT6360_SLAVE_MAX; i++) {
361 mpd->i2c[i] = devm_i2c_new_dummy_device(&client->dev,
362 client->adapter,
363 mt6360_slave_addr[i]);
364 if (IS_ERR(mpd->i2c[i])) {
365 dev_err(&client->dev, "new i2c dev [%d] fail\n", i);
366 return PTR_ERR(mpd->i2c[i]);
367 }
368 i2c_set_clientdata(mpd->i2c[i], mpd);
369 }
370
371 ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_AUTO,
372 mt6360_devs, ARRAY_SIZE(mt6360_devs), NULL,
373 0, regmap_irq_get_domain(mpd->irq_data));
374 if (ret < 0) {
375 dev_err(&client->dev, "mfd add cells fail\n");
376 return ret;
377 }
378
379 return 0;
380 }
381
382 static int mt6360_pmu_remove(struct i2c_client *client)
383 {
384 return 0;
385 }
386
387 static int __maybe_unused mt6360_pmu_suspend(struct device *dev)
388 {
389 struct i2c_client *i2c = to_i2c_client(dev);
390
391 if (device_may_wakeup(dev))
> 392 enable_irq_wake(i2c->irq); 393
394 return 0;
395 }
396
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 388 lines · Gene Chen
From: Gene Chen <[email protected]>
Add mfd driver for mt6360 pmic chip include
Battery Charger/USB_PD/Flash LED/RGB LED/LDO/BuckSigned-off-by Gene Chen <[email protected]--- drivers/mfd/Kconfig | 12 + drivers/mfd/Makefile | 1 + drivers/mfd/mt6360-core.c | 437 +++++++++++++++++++++++++++++ include/linux/mfd/mt6360-private.h | 217 ++++++++++++++ include/linux/mfd/mt6360.h | 32 +++ 5 files changed, 699 insertions(+) create mode 100644 drivers/mfd/mt6360-core.c create mode 100644 include/linux/mfd/mt6360-private.h create mode 100644 include/linux/mfd/mt6360.hchangelogs between v1 & v2
- include missing header filechangelogs between v2 & v3
- add changelogschangelogs between v3 & v4
- fixKconfigdescription
- replacemt6360_pmu_infowithmt6360_pmu_data
- replace probe withprobe_new
- remove unnecessaryirq_chipvariable
- remove annotation
- replaceMT6360_MFD_CELLwithOF_MFD_CELLchangelogs between v4 & v5
- remove unnecessary parse dt function
- usedevm_i2c_new_dummy_device
- add base-commit messagedrivers/mfd/Kconfig +12
-0@@ -856,6 +856,18 @@ config MFD_MAX8998 additional drivers must be enabled in order to use the functionality of the device. +config MFD_MT6360 + tristate "Mediatek MT6360 SubPMIC" + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + depends on I2C + help + Say Y here to enable MT6360 PMU/PMIC/LDO functional support. + PMU part includes Charger, Flashlight, RGB LED + PMIC part includes 2-channel BUCKs and 2-channel LDOs + LDO part includes 4-channel LDOs + config MFD_MT6397 tristate "MediaTek MT6397 PMIC Support" select MFD_COREdrivers/mfd/Makefile +1
-0@@ -238,6 +238,7 @@ obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_INTEL_SOC_PMIC_BXTWC) += intel_soc_pmic_bxtwc.o obj-$(CONFIG_INTEL_SOC_PMIC_CHTWC) += intel_soc_pmic_chtwc.o obj-$(CONFIG_INTEL_SOC_PMIC_CHTDC_TI) += intel_soc_pmic_chtdc_ti.o +obj-$(CONFIG_MFD_MT6360) += mt6360-core.o mt6397-objs := mt6397-core.o mt6397-irq.o obj-$(CONFIG_MFD_MT6397) += mt6397.o obj-$(CONFIG_INTEL_SOC_PMIC_MRFLD) += intel_soc_pmic_mrfld.odrivers/mfd/mt6360-core.c new file +311
-0@@ -0,0 +1,437 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +*/ + +#include <linux/i2c.h> +#include <linux/init.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> +#include <linux/mfd/mt6360-private.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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) +/* 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) + +#define MT6360_REGMAP_IRQ_REG (_irq_evt) \ + REGMAP_IRQ_REG(_irq_evt, (_irq_evt) / 8, BIT((_irq_evt) % 8)) + +static const struct regmap_irq mt6360_pmu_irqs[] = { +MT6360_REGMAP_IRQ_REG (MT6360_CHG_TREG_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_AICR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_MIVR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_PWR_RDY_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_BATSYSUV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED_CHG_VINOVP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_VSYSUV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_VSYSOV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_VBATOV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_VBUSOV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_WD_PMU_DET ), +MT6360_REGMAP_IRQ_REG (MT6360_WD_PMU_DONE ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_TMRI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_ADPBADI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_RVPI ), +MT6360_REGMAP_IRQ_REG (MT6360_OTPI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_AICCMEASL ), +MT6360_REGMAP_IRQ_REG (MT6360_CHGDET_DONEI ), +MT6360_REGMAP_IRQ_REG (MT6360_WDTMRI ), +MT6360_REGMAP_IRQ_REG (MT6360_SSFINISHI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_RECHGI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_TERMI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_IEOCI ), +MT6360_REGMAP_IRQ_REG (MT6360_PUMPX_DONEI ), +MT6360_REGMAP_IRQ_REG (MT6360_CHG_TREG_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BAT_OVP_ADC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_TYPEC_OTP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_ADC_WAKEUP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_ADC_DONEI ), +MT6360_REGMAP_IRQ_REG (MT6360_BST_BATUVI ), +MT6360_REGMAP_IRQ_REG (MT6360_BST_VBUSOVI ), +MT6360_REGMAP_IRQ_REG (MT6360_BST_OLPI ), +MT6360_REGMAP_IRQ_REG (MT6360_ATTACH_I ), +MT6360_REGMAP_IRQ_REG (MT6360_DETACH_I ), +MT6360_REGMAP_IRQ_REG (MT6360_QC30_STPDONE ), +MT6360_REGMAP_IRQ_REG (MT6360_QC_VBUSDET_DONE ), +MT6360_REGMAP_IRQ_REG (MT6360_HVDCP_DET ), +MT6360_REGMAP_IRQ_REG (MT6360_CHGDETI ), +MT6360_REGMAP_IRQ_REG (MT6360_DCDTI ), +MT6360_REGMAP_IRQ_REG (MT6360_FOD_DONE_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FOD_OV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHRDET_UVP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHRDET_OVP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_CHRDET_EXT_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FOD_LR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FOD_HR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FOD_DISCHG_FAIL_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_USBID_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_APWDTRST_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_EN_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_QONB_RST_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_MRSTB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_OTP_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_VDDAOV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_SYSUV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED_STRBPIN_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED_TORPIN_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED_TX_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED_LVF_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED2_SHORT_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED1_SHORT_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED2_STRB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED1_STRB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED2_STRB_TO_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED1_STRB_TO_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED2_TOR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_FLED1_TOR_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK1_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK1_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK1_OV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK1_UV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK2_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK2_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK2_OV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_BUCK2_UV_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO1_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO2_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO3_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO5_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO6_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO7_OC_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO1_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO2_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO3_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO5_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO6_PGB_EVT ), +MT6360_REGMAP_IRQ_REG (MT6360_LDO7_PGB_EVT ), +}; + +static int mt6360_pmu_handle_post_irq (void *irq_drv_data) +{ +struct mt6360_pmu_data *mpd = irq_drv_data; + +return regmap_update_bits (mpd->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), + .num_regs =MT6360_PMU_IRQ_REGNUM , + .mask_base =MT6360_PMU_CHG_MASK1 , + .status_base =MT6360_PMU_CHG_IRQ1 , + .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 = { + .reg_bits =8 , + .val_bits =8 , + .max_register =MT6360_PMU_MAXREG , +}; + +static const struct resource mt6360_adc_resources[] = { +DEFINE_RES_IRQ_NAMED (MT6360_ADC_DONEI ,"adc_donei" ), +}; + +static const struct resource mt6360_chg_resources[] = { +DEFINE_RES_IRQ_NAMED (MT6360_CHG_TREG_EVT ,"chg_treg_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_PWR_RDY_EVT ,"pwr_rdy_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_BATSYSUV_EVT ,"chg_batsysuv_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_VSYSUV_EVT ,"chg_vsysuv_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_VSYSOV_EVT ,"chg_vsysov_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_VBATOV_EVT ,"chg_vbatov_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_VBUSOV_EVT ,"chg_vbusov_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_AICCMEASL ,"chg_aiccmeasl" ), +DEFINE_RES_IRQ_NAMED (MT6360_WDTMRI ,"wdtmri" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_RECHGI ,"chg_rechgi" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_TERMI ,"chg_termi" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHG_IEOCI ,"chg_ieoci" ), +DEFINE_RES_IRQ_NAMED (MT6360_PUMPX_DONEI ,"pumpx_donei" ), +DEFINE_RES_IRQ_NAMED (MT6360_ATTACH_I ,"attach_i" ), +DEFINE_RES_IRQ_NAMED (MT6360_CHRDET_EXT_EVT ,"chrdet_ext_evt" ), +}; + +static const struct resource mt6360_led_resources[] = { +DEFINE_RES_IRQ_NAMED (MT6360_FLED_CHG_VINOVP_EVT ,"fled_chg_vinovp_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_FLED_LVF_EVT ,"fled_lvf_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_FLED2_SHORT_EVT ,"fled2_short_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_FLED1_SHORT_EVT ,"fled1_short_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_FLED2_STRB_TO_EVT ,"fled2_strb_to_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_FLED1_STRB_TO_EVT ,"fled1_strb_to_evt" ), +}; + +static const struct resource mt6360_pmic_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" ), +DEFINE_RES_IRQ_NAMED (MT6360_BUCK1_UV_EVT ,"buck1_uv_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_BUCK2_PGB_EVT ,"buck2_pgb_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_BUCK2_OC_EVT ,"buck2_oc_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_BUCK2_OV_EVT ,"buck2_ov_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_BUCK2_UV_EVT ,"buck2_uv_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO6_OC_EVT ,"ldo6_oc_evt" ), +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" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO5_OC_EVT ,"ldo5_oc_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO1_PGB_EVT ,"ldo1_pgb_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO2_PGB_EVT ,"ldo2_pgb_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO3_PGB_EVT ,"ldo3_pgb_evt" ), +DEFINE_RES_IRQ_NAMED (MT6360_LDO5_PGB_EVT ,"ldo5_pgb_evt" ), +}; + +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" ), +}; +
drivers/mfd/mt6360-core.c line 321
Quoted 10 lines
drivers/mfd/mt6360-core.c new file +10
-0+static const unsigned short mt6360_slave_addr[MT6360_SLAVE_MAX ] = { +MT6360_PMU_SLAVEID , +MT6360_PMIC_SLAVEID , +MT6360_LDO_SLAVEID , +MT6360_TCPC_SLAVEID , +}; + +static int mt6360_pmu_probe (struct i2c_client *client) +{ +struct mt6360_pmu_data *mpd;
struct mt6360_pmu_ddata *ddata;
drivers/mfd/mt6360-core.c line 322
Quoted 1 line
drivers/mfd/mt6360-core.c new file +1
-0+unsigned int reg_data =0 ;
Why does this have to be pre-initialised?
Quoted 22 lines
drivers/mfd/mt6360-core.c new file +22
-0+int i, ret; + + mpd =devm_kzalloc (&client->dev,sizeof (*mpd),GFP_KERNEL ); +if (!mpd) +return -ENOMEM ; + + mpd->dev = &client->dev; +i2c_set_clientdata (client, mpd); + + mpd->regmap =devm_regmap_init_i2c (client, &mt6360_pmu_regmap_config); +if (IS_ERR (mpd->regmap)) { +dev_err (&client->dev,"Failed to register regmap\n" ); +return PTR_ERR (mpd->regmap); + } + + ret =regmap_read (mpd->regmap,MT6360_PMU_DEV_INFO , ®_data); +if (ret <0 ) { +dev_err (&client->dev,"Device not found\n" ); +return ret; + } + + mpd->chip_rev = reg_data &CHIP_REV_MASK ;
drivers/mfd/mt6360-core.c line 354
Quoted 10 lines
drivers/mfd/mt6360-core.c new file +10
-0+if (mpd->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, +IRQF_TRIGGER_FALLING ,0 , + &mt6360_pmu_irq_chip, &mpd->irq_data); +if (ret <0 ) {
Is it possible for ret to be >0?
If not, just use "if (ret)".
drivers/mfd/mt6360-core.c line 365
Quoted 11 lines
drivers/mfd/mt6360-core.c new file +11
-0+dev_err (&client->dev,"Failed to add Regmap IRQ Chip\n" ); +return ret; + } + + mpd->i2c[0 ] = client; +for (i =1 ; i <MT6360_SLAVE_MAX ; i++) { + mpd->i2c[i] =devm_i2c_new_dummy_device (&client->dev, + client->adapter, + mt6360_slave_addr[i]); +if (IS_ERR (mpd->i2c[i])) { +dev_err (&client->dev,"new i2c dev [%d] fail\n" , i);
This is not a very user friendly log message.
"Failed to get new dummy I2C device for address 0x%x", mt6360_slave_addr[i]
drivers/mfd/mt6360-core.c line 374
Quoted 9 lines
drivers/mfd/mt6360-core.c new file +9
-0+return PTR_ERR (mpd->i2c[i]); + } +i2c_set_clientdata (mpd->i2c[i], mpd); + } + + 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)); +if (ret <0 ) {
"if (ret)"
drivers/mfd/mt6360-core.c line 375
Quoted 1 line
drivers/mfd/mt6360-core.c new file +1
-0+dev_err (&client->dev,"mfd add cells fail\n" );
"Failed to register subordinate devices" or similar.
drivers/mfd/mt6360-core.c line 383
Quoted 8 lines
drivers/mfd/mt6360-core.c new file +8
-0+return ret; + } + +return 0 ; +} + +static int mt6360_pmu_remove (struct i2c_client *client) +{
An empty remove call-back?
Quoted 28 lines
drivers/mfd/mt6360-core.c new file +28
-0+return 0 ; +} + +static int __maybe_unused mt6360_pmu_suspend (struct device *dev) +{ +struct i2c_client *i2c =to_i2c_client (dev); + +if (device_may_wakeup (dev)) +enable_irq_wake (i2c->irq); + +return 0 ; +} + +static int __maybe_unused mt6360_pmu_resume (struct device *dev) +{ + +struct i2c_client *i2c =to_i2c_client (dev); + +if (device_may_wakeup (dev)) +disable_irq_wake (i2c->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mt6360_pmu_pm_ops, + mt6360_pmu_suspend, mt6360_pmu_resume); + +static const struct of_device_id __maybe_unused mt6360_pmu_of_id[] = {
drivers/mfd/mt6360-core.c line 421
Quoted 10 lines
drivers/mfd/mt6360-core.c new file +10
-0+ { .compatible = "mediatek,mt6360_pmu", }, + {}, +}; +MODULE_DEVICE_TABLE (of, mt6360_pmu_of_id); + +static const struct i2c_device_id mt6360_pmu_id[] = { + {"mt6360_pmu" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (i2c, mt6360_pmu_id);
Use probe2 and you can remove this table.
drivers/mfd/mt6360-core.c line 434
Quoted 12 lines
drivers/mfd/mt6360-core.c new file +12
-0+static struct i2c_driver mt6360_pmu_driver = { + .driver = { + .pm = &mt6360_pmu_pm_ops, + .of_match_table =of_match_ptr (mt6360_pmu_of_id), + }, + .probe_new = mt6360_pmu_probe, + .remove = mt6360_pmu_remove, + .id_table = mt6360_pmu_id, +}; +module_i2c_driver (mt6360_pmu_driver); + +MODULE_AUTHOR ("CY_Huang <[email protected]>" );
Please use your proper name.
drivers/mfd/mt6360-core.c line 436
Quoted 2 lines
drivers/mfd/mt6360-core.c new file +2
-0+MODULE_DESCRIPTION ("MT6360 PMU I2C Driver" ); +MODULE_LICENSE ("GPL" );
This does not match the header.
drivers/mfd/mt6360-core.c line 437
Quoted 1 line
drivers/mfd/mt6360-core.c new file +1
-0+MODULE_VERSION ("1.0.0" );
Do you actually use this?
Quoted 266 lines
include/linux/mfd/mt6360-private.h new file +217
-0@@ -0,0 +1,217 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +*/ + +#ifndef __MT6360_PRIVATE_H__ +#define __MT6360_PRIVATE_H__ + +/* PMU register defininition */ +#define MT6360_PMU_DEV_INFO (0x00) +#define MT6360_PMU_CORE_CTRL1 (0x01) +#define MT6360_PMU_RST1 (0x02) +#define MT6360_PMU_CRCEN (0x03) +#define MT6360_PMU_RST_PAS_CODE1 (0x04) +#define MT6360_PMU_RST_PAS_CODE2 (0x05) +#define MT6360_PMU_CORE_CTRL2 (0x06) +#define MT6360_PMU_TM_PAS_CODE1 (0x07) +#define MT6360_PMU_TM_PAS_CODE2 (0x08) +#define MT6360_PMU_TM_PAS_CODE3 (0x09) +#define MT6360_PMU_TM_PAS_CODE4 (0x0A) +#define MT6360_PMU_IRQ_IND (0x0B) +#define MT6360_PMU_IRQ_MASK (0x0C) +#define MT6360_PMU_IRQ_SET (0x0D) +#define MT6360_PMU_SHDN_CTRL (0x0E) +#define MT6360_PMU_TM_INF (0x0F) +#define MT6360_PMU_I2C_CTRL (0x10) +#define MT6360_PMU_CHG_CTRL1 (0x11) +#define MT6360_PMU_CHG_CTRL2 (0x12) +#define MT6360_PMU_CHG_CTRL3 (0x13) +#define MT6360_PMU_CHG_CTRL4 (0x14) +#define MT6360_PMU_CHG_CTRL5 (0x15) +#define MT6360_PMU_CHG_CTRL6 (0x16) +#define MT6360_PMU_CHG_CTRL7 (0x17) +#define MT6360_PMU_CHG_CTRL8 (0x18) +#define MT6360_PMU_CHG_CTRL9 (0x19) +#define MT6360_PMU_CHG_CTRL10 (0x1A) +#define MT6360_PMU_CHG_CTRL11 (0x1B) +#define MT6360_PMU_CHG_CTRL12 (0x1C) +#define MT6360_PMU_CHG_CTRL13 (0x1D) +#define MT6360_PMU_CHG_CTRL14 (0x1E) +#define MT6360_PMU_CHG_CTRL15 (0x1F) +#define MT6360_PMU_CHG_CTRL16 (0x20) +#define MT6360_PMU_CHG_AICC_RESULT (0x21) +#define MT6360_PMU_DEVICE_TYPE (0x22) +#define MT6360_PMU_QC_CONTROL1 (0x23) +#define MT6360_PMU_QC_CONTROL2 (0x24) +#define MT6360_PMU_QC30_CONTROL1 (0x25) +#define MT6360_PMU_QC30_CONTROL2 (0x26) +#define MT6360_PMU_USB_STATUS1 (0x27) +#define MT6360_PMU_QC_STATUS1 (0x28) +#define MT6360_PMU_QC_STATUS2 (0x29) +#define MT6360_PMU_CHG_PUMP (0x2A) +#define MT6360_PMU_CHG_CTRL17 (0x2B) +#define MT6360_PMU_CHG_CTRL18 (0x2C) +#define MT6360_PMU_CHRDET_CTRL1 (0x2D) +#define MT6360_PMU_CHRDET_CTRL2 (0x2E) +#define MT6360_PMU_DPDN_CTRL (0x2F) +#define MT6360_PMU_CHG_HIDDEN_CTRL1 (0x30) +#define MT6360_PMU_CHG_HIDDEN_CTRL2 (0x31) +#define MT6360_PMU_CHG_HIDDEN_CTRL3 (0x32) +#define MT6360_PMU_CHG_HIDDEN_CTRL4 (0x33) +#define MT6360_PMU_CHG_HIDDEN_CTRL5 (0x34) +#define MT6360_PMU_CHG_HIDDEN_CTRL6 (0x35) +#define MT6360_PMU_CHG_HIDDEN_CTRL7 (0x36) +#define MT6360_PMU_CHG_HIDDEN_CTRL8 (0x37) +#define MT6360_PMU_CHG_HIDDEN_CTRL9 (0x38) +#define MT6360_PMU_CHG_HIDDEN_CTRL10 (0x39) +#define MT6360_PMU_CHG_HIDDEN_CTRL11 (0x3A) +#define MT6360_PMU_CHG_HIDDEN_CTRL12 (0x3B) +#define MT6360_PMU_CHG_HIDDEN_CTRL13 (0x3C) +#define MT6360_PMU_CHG_HIDDEN_CTRL14 (0x3D) +#define MT6360_PMU_CHG_HIDDEN_CTRL15 (0x3E) +#define MT6360_PMU_CHG_HIDDEN_CTRL16 (0x3F) +#define MT6360_PMU_CHG_HIDDEN_CTRL17 (0x40) +#define MT6360_PMU_CHG_HIDDEN_CTRL18 (0x41) +#define MT6360_PMU_CHG_HIDDEN_CTRL19 (0x42) +#define MT6360_PMU_CHG_HIDDEN_CTRL20 (0x43) +#define MT6360_PMU_CHG_HIDDEN_CTRL21 (0x44) +#define MT6360_PMU_CHG_HIDDEN_CTRL22 (0x45) +#define MT6360_PMU_CHG_HIDDEN_CTRL23 (0x46) +#define MT6360_PMU_CHG_HIDDEN_CTRL24 (0x47) +#define MT6360_PMU_CHG_HIDDEN_CTRL25 (0x48) +#define MT6360_PMU_BC12_CTRL (0x49) +#define MT6360_PMU_CHG_STAT (0x4A) +#define MT6360_PMU_RESV1 (0x4B) +#define MT6360_PMU_TYPEC_OTP_TH_SEL_CODEH (0x4E) +#define MT6360_PMU_TYPEC_OTP_TH_SEL_CODEL (0x4F) +#define MT6360_PMU_TYPEC_OTP_HYST_TH (0x50) +#define MT6360_PMU_TYPEC_OTP_CTRL (0x51) +#define MT6360_PMU_ADC_BAT_DATA_H (0x52) +#define MT6360_PMU_ADC_BAT_DATA_L (0x53) +#define MT6360_PMU_IMID_BACKBST_ON (0x54) +#define MT6360_PMU_IMID_BACKBST_OFF (0x55) +#define MT6360_PMU_ADC_CONFIG (0x56) +#define MT6360_PMU_ADC_EN2 (0x57) +#define MT6360_PMU_ADC_IDLE_T (0x58) +#define MT6360_PMU_ADC_RPT_1 (0x5A) +#define MT6360_PMU_ADC_RPT_2 (0x5B) +#define MT6360_PMU_ADC_RPT_3 (0x5C) +#define MT6360_PMU_ADC_RPT_ORG1 (0x5D) +#define MT6360_PMU_ADC_RPT_ORG2 (0x5E) +#define MT6360_PMU_BAT_OVP_TH_SEL_CODEH (0x5F) +#define MT6360_PMU_BAT_OVP_TH_SEL_CODEL (0x60) +#define MT6360_PMU_CHG_CTRL19 (0x61) +#define MT6360_PMU_VDDASUPPLY (0x62) +#define MT6360_PMU_BC12_MANUAL (0x63) +#define MT6360_PMU_CHGDET_FUNC (0x64) +#define MT6360_PMU_FOD_CTRL (0x65) +#define MT6360_PMU_CHG_CTRL20 (0x66) +#define MT6360_PMU_CHG_HIDDEN_CTRL26 (0x67) +#define MT6360_PMU_CHG_HIDDEN_CTRL27 (0x68) +#define MT6360_PMU_RESV2 (0x69) +#define MT6360_PMU_USBID_CTRL1 (0x6D) +#define MT6360_PMU_USBID_CTRL2 (0x6E) +#define MT6360_PMU_USBID_CTRL3 (0x6F) +#define MT6360_PMU_FLED_CFG (0x70) +#define MT6360_PMU_RESV3 (0x71) +#define MT6360_PMU_FLED1_CTRL (0x72) +#define MT6360_PMU_FLED_STRB_CTRL (0x73) +#define MT6360_PMU_FLED1_STRB_CTRL2 (0x74) +#define MT6360_PMU_FLED1_TOR_CTRL (0x75) +#define MT6360_PMU_FLED2_CTRL (0x76) +#define MT6360_PMU_RESV4 (0x77) +#define MT6360_PMU_FLED2_STRB_CTRL2 (0x78) +#define MT6360_PMU_FLED2_TOR_CTRL (0x79) +#define MT6360_PMU_FLED_VMIDTRK_CTRL1 (0x7A) +#define MT6360_PMU_FLED_VMID_RTM (0x7B) +#define MT6360_PMU_FLED_VMIDTRK_CTRL2 (0x7C) +#define MT6360_PMU_FLED_PWSEL (0x7D) +#define MT6360_PMU_FLED_EN (0x7E) +#define MT6360_PMU_FLED_Hidden1 (0x7F) +#define MT6360_PMU_RGB_EN (0x80) +#define MT6360_PMU_RGB1_ISNK (0x81) +#define MT6360_PMU_RGB2_ISNK (0x82) +#define MT6360_PMU_RGB3_ISNK (0x83) +#define MT6360_PMU_RGB_ML_ISNK (0x84) +#define MT6360_PMU_RGB1_DIM (0x85) +#define MT6360_PMU_RGB2_DIM (0x86) +#define MT6360_PMU_RGB3_DIM (0x87) +#define MT6360_PMU_RESV5 (0x88) +#define MT6360_PMU_RGB12_Freq (0x89) +#define MT6360_PMU_RGB34_Freq (0x8A) +#define MT6360_PMU_RGB1_Tr (0x8B) +#define MT6360_PMU_RGB1_Tf (0x8C) +#define MT6360_PMU_RGB1_TON_TOFF (0x8D) +#define MT6360_PMU_RGB2_Tr (0x8E) +#define MT6360_PMU_RGB2_Tf (0x8F) +#define MT6360_PMU_RGB2_TON_TOFF (0x90) +#define MT6360_PMU_RGB3_Tr (0x91) +#define MT6360_PMU_RGB3_Tf (0x92) +#define MT6360_PMU_RGB3_TON_TOFF (0x93) +#define MT6360_PMU_RGB_Hidden_CTRL1 (0x94) +#define MT6360_PMU_RGB_Hidden_CTRL2 (0x95) +#define MT6360_PMU_RESV6 (0x97) +#define MT6360_PMU_SPARE1 (0x9A) +#define MT6360_PMU_SPARE2 (0xA0) +#define MT6360_PMU_SPARE3 (0xB0) +#define MT6360_PMU_SPARE4 (0xC0) +#define MT6360_PMU_CHG_IRQ1 (0xD0) +#define MT6360_PMU_CHG_IRQ2 (0xD1) +#define MT6360_PMU_CHG_IRQ3 (0xD2) +#define MT6360_PMU_CHG_IRQ4 (0xD3) +#define MT6360_PMU_CHG_IRQ5 (0xD4) +#define MT6360_PMU_CHG_IRQ6 (0xD5) +#define MT6360_PMU_QC_IRQ (0xD6) +#define MT6360_PMU_FOD_IRQ (0xD7) +#define MT6360_PMU_BASE_IRQ (0xD8) +#define MT6360_PMU_FLED_IRQ1 (0xD9) +#define MT6360_PMU_FLED_IRQ2 (0xDA) +#define MT6360_PMU_RGB_IRQ (0xDB) +#define MT6360_PMU_BUCK1_IRQ (0xDC) +#define MT6360_PMU_BUCK2_IRQ (0xDD) +#define MT6360_PMU_LDO_IRQ1 (0xDE) +#define MT6360_PMU_LDO_IRQ2 (0xDF) +#define MT6360_PMU_CHG_STAT1 (0xE0) +#define MT6360_PMU_CHG_STAT2 (0xE1) +#define MT6360_PMU_CHG_STAT3 (0xE2) +#define MT6360_PMU_CHG_STAT4 (0xE3) +#define MT6360_PMU_CHG_STAT5 (0xE4) +#define MT6360_PMU_CHG_STAT6 (0xE5) +#define MT6360_PMU_QC_STAT (0xE6) +#define MT6360_PMU_FOD_STAT (0xE7) +#define MT6360_PMU_BASE_STAT (0xE8) +#define MT6360_PMU_FLED_STAT1 (0xE9) +#define MT6360_PMU_FLED_STAT2 (0xEA) +#define MT6360_PMU_RGB_STAT (0xEB) +#define MT6360_PMU_BUCK1_STAT (0xEC) +#define MT6360_PMU_BUCK2_STAT (0xED) +#define MT6360_PMU_LDO_STAT1 (0xEE) +#define MT6360_PMU_LDO_STAT2 (0xEF) +#define MT6360_PMU_CHG_MASK1 (0xF0) +#define MT6360_PMU_CHG_MASK2 (0xF1) +#define MT6360_PMU_CHG_MASK3 (0xF2) +#define MT6360_PMU_CHG_MASK4 (0xF3) +#define MT6360_PMU_CHG_MASK5 (0xF4) +#define MT6360_PMU_CHG_MASK6 (0xF5) +#define MT6360_PMU_QC_MASK (0xF6) +#define MT6360_PMU_FOD_MASK (0xF7) +#define MT6360_PMU_BASE_MASK (0xF8) +#define MT6360_PMU_FLED_MASK1 (0xF9) +#define MT6360_PMU_FLED_MASK2 (0xFA) +#define MT6360_PMU_FAULTB_MASK (0xFB) +#define MT6360_PMU_BUCK1_MASK (0xFC) +#define MT6360_PMU_BUCK2_MASK (0xFD) +#define MT6360_PMU_LDO_MASK1 (0xFE) +#define MT6360_PMU_LDO_MASK2 (0xFF) +#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_IRQ_RETRIG BIT(2) + +#define CHIP_VEN_MASK (0xF0) +#define CHIP_VEN_MT6360 (0x50) +#define CHIP_REV_MASK (0x0F) + +#endif /* __MT6360_PRIVATE_H__ */ include/linux/mfd/mt6360.h new file +32
-0@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +*/ + +#ifndef __MT6360_H__ +#define __MT6360_H__ + +#include <linux/regmap.h> + +enum { +MT6360_SLAVE_PMU =0 , +MT6360_SLAVE_PMIC , +MT6360_SLAVE_LDO , +MT6360_SLAVE_TCPC , +MT6360_SLAVE_MAX , +}; + +#define MT6360_PMU_SLAVEID (0x34) +#define MT6360_PMIC_SLAVEID (0x1A) +#define MT6360_LDO_SLAVEID (0x64) +#define MT6360_TCPC_SLAVEID (0x4E) + +struct mt6360_pmu_data { +struct i2c_client *i2c[MT6360_SLAVE_MAX ]; +struct device *dev; +struct regmap *regmap; +struct regmap_irq_chip_data *irq_data; +unsigned int chip_rev; +}; + +#endif /* __MT6360_H__ */ base-commit:
7d194c2100ad2a6dded545887d02754948ca5241Signature · 1 line
2.23.0
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog