On Mon, 13 Jun 2022, ChiaEn Wu wrote:
> From: ChiYuan Huang <cy_huang@xxxxxxxxxxx>
>
> Add Mediatek MT6370 MFD support.
>
> Signed-off-by: ChiYuan Huang <cy_huang@xxxxxxxxxxx>
> ---
> drivers/mfd/Kconfig | 13 ++
> drivers/mfd/Makefile | 1 +
> drivers/mfd/mt6370.c | 349 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 363 insertions(+)
> create mode 100644 drivers/mfd/mt6370.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 3b59456f5545..d9a7524a3e0e 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -937,6 +937,19 @@ config MFD_MT6360
> PMIC part includes 2-channel BUCKs and 2-channel LDOs
> LDO part includes 4-channel LDOs
>
> +config MFD_MT6370
> + tristate "Mediatek MT6370 SubPMIC"
> + select MFD_CORE
> + select REGMAP_I2C
> + select REGMAP_IRQ
> + depends on I2C
> + help
> + Say Y here to enable MT6370 SubPMIC functional support.
> + It integrate single cell battery charger with adc monitoring, RGB
s/integrates/consists of a/
"ADC"
> + LEDs, dual channel flashlight, WLED backlight driver, display bias
> + voltage supply, one general purpose LDO, and cc logic
> + controller with USBPD commmunication capable.
The last part makes no sense - "and is USBPD"?
> config MFD_MT6397
> tristate "MediaTek MT6397 PMIC Support"
> select MFD_CORE
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 858cacf659d6..62b27125420e 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -242,6 +242,7 @@ 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
> +obj-$(CONFIG_MFD_MT6370) += mt6370.o
> mt6397-objs := mt6397-core.o mt6397-irq.o mt6358-irq.o
> obj-$(CONFIG_MFD_MT6397) += mt6397.o
> obj-$(CONFIG_INTEL_SOC_PMIC_MRFLD) += intel_soc_pmic_mrfld.o
> diff --git a/drivers/mfd/mt6370.c b/drivers/mfd/mt6370.c
> new file mode 100644
> index 000000000000..6af9f73c9c0c
> --- /dev/null
> +++ b/drivers/mfd/mt6370.c
> @@ -0,0 +1,349 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <linux/bits.h>
> +#include <linux/i2c.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/core.h>
> +#include <linux/module.h>
> +#include <linux/regmap.h>
> +
> +enum {
> + MT6370_USBC_I2C = 0,
> + MT6370_PMU_I2C,
> + MT6370_MAX_I2C
> +};
> +
> +#define MT6370_REG_DEV_INFO 0x100
> +#define MT6370_REG_CHG_IRQ1 0x1C0
> +#define MT6370_REG_CHG_MASK1 0x1E0
> +
> +#define MT6370_VENID_MASK GENMASK(7, 4)
> +
> +#define MT6370_NUM_IRQREGS 16
> +#define MT6370_USBC_I2CADDR 0x4E
> +#define MT6370_REG_ADDRLEN 2
> +#define MT6370_REG_MAXADDR 0x1FF
> +
> +/* IRQ definitions */
> +#define MT6370_IRQ_DIRCHGON 0
> +#define MT6370_IRQ_CHG_TREG 4
> +#define MT6370_IRQ_CHG_AICR 5
> +#define MT6370_IRQ_CHG_MIVR 6
> +#define MT6370_IRQ_PWR_RDY 7
> +#define MT6370_IRQ_FL_CHG_VINOVP 11
> +#define MT6370_IRQ_CHG_VSYSUV 12
> +#define MT6370_IRQ_CHG_VSYSOV 13
> +#define MT6370_IRQ_CHG_VBATOV 14
> +#define MT6370_IRQ_CHG_VINOVPCHG 15
> +#define MT6370_IRQ_TS_BAT_COLD 20
> +#define MT6370_IRQ_TS_BAT_COOL 21
> +#define MT6370_IRQ_TS_BAT_WARM 22
> +#define MT6370_IRQ_TS_BAT_HOT 23
> +#define MT6370_IRQ_TS_STATC 24
> +#define MT6370_IRQ_CHG_FAULT 25
> +#define MT6370_IRQ_CHG_STATC 26
> +#define MT6370_IRQ_CHG_TMR 27
> +#define MT6370_IRQ_CHG_BATABS 28
> +#define MT6370_IRQ_CHG_ADPBAD 29
> +#define MT6370_IRQ_CHG_RVP 30
> +#define MT6370_IRQ_TSHUTDOWN 31
> +#define MT6370_IRQ_CHG_IINMEAS 32
> +#define MT6370_IRQ_CHG_ICCMEAS 33
> +#define MT6370_IRQ_CHGDET_DONE 34
> +#define MT6370_IRQ_WDTMR 35
> +#define MT6370_IRQ_SSFINISH 36
> +#define MT6370_IRQ_CHG_RECHG 37
> +#define MT6370_IRQ_CHG_TERM 38
> +#define MT6370_IRQ_CHG_IEOC 39
> +#define MT6370_IRQ_ADC_DONE 40
> +#define MT6370_IRQ_PUMPX_DONE 41
> +#define MT6370_IRQ_BST_BATUV 45
> +#define MT6370_IRQ_BST_MIDOV 46
> +#define MT6370_IRQ_BST_OLP 47
> +#define MT6370_IRQ_ATTACH 48
> +#define MT6370_IRQ_DETACH 49
> +#define MT6370_IRQ_HVDCP_STPDONE 51
> +#define MT6370_IRQ_HVDCP_VBUSDET_DONE 52
> +#define MT6370_IRQ_HVDCP_DET 53
> +#define MT6370_IRQ_CHGDET 54
> +#define MT6370_IRQ_DCDT 55
> +#define MT6370_IRQ_DIRCHG_VGOK 59
> +#define MT6370_IRQ_DIRCHG_WDTMR 60
> +#define MT6370_IRQ_DIRCHG_UC 61
> +#define MT6370_IRQ_DIRCHG_OC 62
> +#define MT6370_IRQ_DIRCHG_OV 63
> +#define MT6370_IRQ_OVPCTRL_SWON 67
> +#define MT6370_IRQ_OVPCTRL_UVP_D 68
> +#define MT6370_IRQ_OVPCTRL_UVP 69
> +#define MT6370_IRQ_OVPCTRL_OVP_D 70
> +#define MT6370_IRQ_OVPCTRL_OVP 71
> +#define MT6370_IRQ_FLED_STRBPIN 72
> +#define MT6370_IRQ_FLED_TORPIN 73
> +#define MT6370_IRQ_FLED_TX 74
> +#define MT6370_IRQ_FLED_LVF 75
> +#define MT6370_IRQ_FLED2_SHORT 78
> +#define MT6370_IRQ_FLED1_SHORT 79
> +#define MT6370_IRQ_FLED2_STRB 80
> +#define MT6370_IRQ_FLED1_STRB 81
> +#define mT6370_IRQ_FLED2_STRB_TO 82
> +#define MT6370_IRQ_FLED1_STRB_TO 83
> +#define MT6370_IRQ_FLED2_TOR 84
> +#define MT6370_IRQ_FLED1_TOR 85
> +#define MT6370_IRQ_OTP 93
> +#define MT6370_IRQ_VDDA_OVP 94
> +#define MT6370_IRQ_VDDA_UV 95
> +#define MT6370_IRQ_LDO_OC 103
> +#define MT6370_IRQ_BLED_OCP 118
> +#define MT6370_IRQ_BLED_OVP 119
> +#define MT6370_IRQ_DSV_VNEG_OCP 123
> +#define MT6370_IRQ_DSV_VPOS_OCP 124
> +#define MT6370_IRQ_DSV_BST_OCP 125
> +#define MT6370_IRQ_DSV_VNEG_SCP 126
> +#define MT6370_IRQ_DSV_VPOS_SCP 127
> +
> +struct mt6370_info {
> + struct i2c_client *i2c[MT6370_MAX_I2C];
> + struct device *dev;
> + struct regmap *regmap;
> + struct regmap_irq_chip_data *irq_data;
> +};
Can we shove all of the above into a header file?
> +static const struct regmap_irq mt6370_irqs[] = {
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHGON, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_TREG, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_AICR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_MIVR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_PWR_RDY, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FL_CHG_VINOVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_VSYSUV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_VSYSOV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_VBATOV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_VINOVPCHG, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TS_BAT_COLD, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TS_BAT_COOL, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TS_BAT_WARM, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TS_BAT_HOT, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TS_STATC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_FAULT, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_STATC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_TMR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_BATABS, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_ADPBAD, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_RVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_TSHUTDOWN, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_IINMEAS, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_ICCMEAS, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHGDET_DONE, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_WDTMR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_SSFINISH, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_RECHG, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_TERM, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHG_IEOC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_ADC_DONE, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_PUMPX_DONE, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_BST_BATUV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_BST_MIDOV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_BST_OLP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_ATTACH, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DETACH, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_HVDCP_STPDONE, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_HVDCP_VBUSDET_DONE, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_HVDCP_DET, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_CHGDET, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DCDT, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHG_VGOK, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHG_WDTMR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHG_UC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHG_OC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DIRCHG_OV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OVPCTRL_SWON, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OVPCTRL_UVP_D, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OVPCTRL_UVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OVPCTRL_OVP_D, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OVPCTRL_OVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED_STRBPIN, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED_TORPIN, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED_TX, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED_LVF, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED2_SHORT, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED1_SHORT, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED2_STRB, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED1_STRB, 8),
> + REGMAP_IRQ_REG_LINE(mT6370_IRQ_FLED2_STRB_TO, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED1_STRB_TO, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED2_TOR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_FLED1_TOR, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_OTP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_VDDA_OVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_VDDA_UV, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_LDO_OC, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_BLED_OCP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_BLED_OVP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DSV_VNEG_OCP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DSV_VPOS_OCP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DSV_BST_OCP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DSV_VNEG_SCP, 8),
> + REGMAP_IRQ_REG_LINE(MT6370_IRQ_DSV_VPOS_SCP, 8)
> +};
> +
> +static const struct regmap_irq_chip mt6370_irq_chip = {
> + .name = "mt6370-irqs",
> + .status_base = MT6370_REG_CHG_IRQ1,
> + .mask_base = MT6370_REG_CHG_MASK1,
> + .num_regs = MT6370_NUM_IRQREGS,
> + .irqs = mt6370_irqs,
> + .num_irqs = ARRAY_SIZE(mt6370_irqs),
> +};
> +
> +static const struct resource mt6370_regulator_irqs[] = {
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_DSV_VPOS_SCP, "db_vpos_scp"),
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_DSV_VNEG_SCP, "db_vneg_scp"),
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_DSV_BST_OCP, "db_vbst_ocp"),
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_DSV_VPOS_OCP, "db_vpos_ocp"),
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_DSV_VNEG_OCP, "db_vneg_ocp"),
> + DEFINE_RES_IRQ_NAMED(MT6370_IRQ_LDO_OC, "ldo_oc")
> +};
> +
> +static const struct mfd_cell mt6370_devices[] = {
> + MFD_CELL_OF("adc", NULL, NULL, 0, 0, "mediatek,mt6370-adc"),
> + MFD_CELL_OF("charger", NULL, NULL, 0, 0, "mediatek,mt6370-charger"),
> + MFD_CELL_OF("backlight", NULL, NULL, 0, 0, "mediatek,mt6370-backlight"),
> + MFD_CELL_OF("flashlight", NULL, NULL, 0, 0, "mediatek,mt6370-flashlight"),
> + MFD_CELL_OF("indicator", NULL, NULL, 0, 0, "mediatek,mt6370-indicator"),
> + MFD_CELL_OF("tcpc", NULL, NULL, 0, 0, "mediatek,mt6370-tcpc"),
> + MFD_CELL_RES("regulator", mt6370_regulator_irqs)
> +};
> +
> +static int mt6370_check_vendor_info(struct mt6370_info *info)
> +{
> + unsigned int devinfo;
> + int ret;
> +
> + ret = regmap_read(info->regmap, MT6370_REG_DEV_INFO, &devinfo);
> + if (ret)
> + return ret;
> +
> + switch (FIELD_GET(MT6370_VENID_MASK, devinfo)) {
> + case 0x8: /* RT5081 */
> + case 0xA: /* RT5081A */
> + case 0xE: /* MT6370 */
> + case 0xF: /* MT6371 */
> + case 0x9: /* MT6372P */
> + case 0xB: /* MT6372CP */
Please define these and drop the comments.
> + break;
> + default:
> + dev_err(info->dev, "Not invalid value 0x%02x\n", devinfo);
> + return -ENODEV;
> + }
> +
> + return 0;
> +}
> +
> +static int mt6370_regmap_read(void *context, const void *reg_buf,
> + size_t reg_size, void *val_buf, size_t val_size)
> +{
> + struct mt6370_info *info = context;
> + u8 bank_idx = *(u8 *)reg_buf, bank_addr = *(u8 *)(reg_buf + 1);
Looks a little scruffy. Perhaps allocate the values below.
> + int ret;
> +
> + ret = i2c_smbus_read_i2c_block_data(info->i2c[bank_idx], bank_addr,
> + val_size, val_buf);
> + if (ret != val_size)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int mt6370_regmap_write(void *context, const void *data, size_t count)
> +{
> + struct mt6370_info *info = context;
> + u8 bank_idx = *(u8 *)data, bank_addr = *(u8 *)(data + 1);
As above.
> + int len = count - MT6370_REG_ADDRLEN;
> +
> + return i2c_smbus_write_i2c_block_data(info->i2c[bank_idx], bank_addr,
> + len, data + MT6370_REG_ADDRLEN);
> +}
> +
> +static const struct regmap_bus mt6370_regmap_bus = {
> + .read = mt6370_regmap_read,
> + .write = mt6370_regmap_write,
> +};
> +
> +static const struct regmap_config mt6370_regmap_config = {
> + .reg_bits = 16,
> + .val_bits = 8,
> + .reg_format_endian = REGMAP_ENDIAN_BIG,
> + .max_register = MT6370_REG_MAXADDR,
> +};
> +
> +static int mt6370_probe(struct i2c_client *i2c)
> +{
> + struct mt6370_info *info;
> + struct i2c_client *usbc_i2c;
> + int ret;
> +
> + info = devm_kzalloc(&i2c->dev, sizeof(*info), GFP_KERNEL);
> + if (!info)
> + return -ENOMEM;
> +
> + info->dev = &i2c->dev;
> +
> + usbc_i2c = devm_i2c_new_dummy_device(&i2c->dev, i2c->adapter,
> + MT6370_USBC_I2CADDR);
> + if (IS_ERR(usbc_i2c)) {
> + ret = PTR_ERR(usbc_i2c);
> + dev_err(&i2c->dev, "Failed to register usbc i2c client %d\n", ret);
"USB-C I2C"?
> + return ret;
> + }
> +
> + /* Assign I2C client for PMU and TypeC */
> + info->i2c[MT6370_PMU_I2C] = i2c;
> + info->i2c[MT6370_USBC_I2C] = usbc_i2c;
> +
> + info->regmap = devm_regmap_init(&i2c->dev, &mt6370_regmap_bus, info,
> + &mt6370_regmap_config);
> + if (IS_ERR(info->regmap)) {
> + ret = PTR_ERR(info->regmap);
> + dev_err(&i2c->dev, "Failed to register regmap (%d)\n", ret);
> + return ret;
> + }
> +
> + ret = mt6370_check_vendor_info(info);
> + if (ret) {
> + dev_err(&i2c->dev, "Failed to check vendor info (%d)\n", ret);
> + return ret;
> + }
> +
> + ret = devm_regmap_add_irq_chip(&i2c->dev, info->regmap, i2c->irq,
> + IRQF_ONESHOT, -1, &mt6370_irq_chip,
> + &info->irq_data);
> + if (ret) {
> + dev_err(&i2c->dev, "Failed to add irq chip (%d)\n", ret);
> + return ret;
> + }
> +
> + return devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_AUTO,
> + mt6370_devices, ARRAY_SIZE(mt6370_devices),
> + NULL, 0,
> + regmap_irq_get_domain(info->irq_data));
> +}
> +
> +static const struct of_device_id mt6370_match_table[] = {
> + { .compatible = "mediatek,mt6370", },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, mt6370_match_table);
> +
> +static struct i2c_driver mt6370_driver = {
> + .driver = {
> + .name = "mt6370",
> + .of_match_table = mt6370_match_table,
> + },
> + .probe_new = mt6370_probe,
> +};
> +module_i2c_driver(mt6370_driver);
> +
> +MODULE_AUTHOR("ChiYuan Huang <cy_huang@xxxxxxxxxxx>");
> +MODULE_DESCRIPTION("MT6370 I2C MFD Driver");
Drop all references to "MFD" please.
> +MODULE_LICENSE("GPL v2");
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
