| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAE+NS37LE69rko0RyMjNHdTJWeaHJA7LZYqb6RHoz=Fi8jPdug@mail.gmail.com>
Date: Mon, 26 Oct 2020 14:45:12 +0800
From: Gene Chen <gene.chen.richtek@...il.com>
To: Krzysztof Kozlowski <krzk@...nel.org>
Cc: sre@...nel.org, Matthias Brugger <matthias.bgg@...il.com>,
Rob Herring <robh+dt@...nel.org>, linux-pm@...r.kernel.org,
devicetree <devicetree@...r.kernel.org>,
linux-arm Mailing List <linux-arm-kernel@...ts.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@...ts.infradead.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Gene Chen <gene_chen@...htek.com>, cy_huang@...htek.com,
shufan_lee@...htek.com
Subject: Re: [PATCH 2/2] power: supply: mt6360_charger: add MT6360 charger support
Krzysztof Kozlowski <krzk@...nel.org> 於 2020年10月16日 週五 下午11:52寫道：
>
> On Wed, Sep 23, 2020 at 07:18:30PM +0800, Gene Chen wrote:
> > From: Gene Chen <gene_chen@...htek.com>
> >
> > Add basic support for the battery charger for MT6360 PMIC
> >
> > Signed-off-by: Gene Chen <gene_chen@...htek.com>
> > ---
> > drivers/power/supply/Kconfig | 11 +
> > drivers/power/supply/Makefile | 1 +
> > drivers/power/supply/mt6360_charger.c | 1190 +++++++++++++++++++++++++++++++++
> > 3 files changed, 1202 insertions(+)
> > create mode 100644 drivers/power/supply/mt6360_charger.c
> >
> > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> > index faf2830..1beb6a4 100644
> > --- a/drivers/power/supply/Kconfig
> > +++ b/drivers/power/supply/Kconfig
> > @@ -562,6 +562,17 @@ config CHARGER_MP2629
> > Battery charger. This driver provides Battery charger power management
> > functions on the systems.
> >
> > +config CHARGER_MT6360
> > + tristate "Mediatek MT6360 Charger Driver"
> > + depends on MFD_MT6360
>
> || COMPILE_TEST
> (and test if it really compiles)
>
> > + depends on REGULATOR
> > + select EXTCON
>
> Drivers should in general not select other user-selectable symbols, so
> this should be rather depends.
>
ACK, I remove extcon device register which may be register by usb driver.
> > + help
> > + Say Y here to enable MT6360 Charger Part.
> > + support High-Accuracy Voltage/Current Regulation,
>
> "The device suppports ..."
>
ACK
> > + Average Input Current Regulation, Battery Tempature Sensing,
> > + Over-Temperature Protection, DPDM Detection for BC1.2
> > +
> > config CHARGER_QCOM_SMBB
> > tristate "Qualcomm Switch-Mode Battery Charger and Boost"
> > depends on MFD_SPMI_PMIC || COMPILE_TEST
> > diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
> > index b3c694a..9abecb9c 100644
> > --- a/drivers/power/supply/Makefile
> > +++ b/drivers/power/supply/Makefile
> > @@ -77,6 +77,7 @@ obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o
> > obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
> > obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
> > obj-$(CONFIG_CHARGER_MP2629) += mp2629_charger.o
> > +obj-$(CONFIG_CHARGER_MT6360) += mt6360_charger.o
> > obj-$(CONFIG_CHARGER_QCOM_SMBB) += qcom_smbb.o
> > obj-$(CONFIG_CHARGER_BQ2415X) += bq2415x_charger.o
> > obj-$(CONFIG_CHARGER_BQ24190) += bq24190_charger.o
> > diff --git a/drivers/power/supply/mt6360_charger.c b/drivers/power/supply/mt6360_charger.c
> > new file mode 100644
> > index 0000000..70e3fb6
> > --- /dev/null
> > +++ b/drivers/power/supply/mt6360_charger.c
> > @@ -0,0 +1,1190 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (c) 2019 MediaTek Inc.
> > + */
> > +
> > +#include <linux/init.h>
> > +#include <linux/module.h>
> > +#include <linux/kernel.h>
> > +#include <linux/regmap.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/of.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/extcon-provider.h>
> > +#include <linux/power_supply.h>
> > +#include <linux/regulator/driver.h>
> > +
> > +#define MT6360_PMU_CHG_CTRL1 (0x11)
>
> Drop all the brackets.
>
ACK
> > +#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_DEVICE_TYPE (0x22)
> > +#define MT6360_PMU_USB_STATUS1 (0x27)
> > +#define MT6360_PMU_CHG_CTRL17 (0x2B)
> > +#define MT6360_PMU_CHG_CTRL18 (0x2C)
> > +#define MT6360_PMU_CHG_STAT (0x4A)
> > +#define MT6360_PMU_CHG_CTRL19 (0x61)
> > +#define MT6360_PMU_FOD_STAT (0xE7)
> > +
> > +/* 0x11 */
>
> Use name, not value in comment.
>
> > +#define MT6360_MASK_FSLP BIT(3)
>
> Here and below - reverse the naming so:
> MT6360_FSLP_MASK
> MT6360_FSLP_SHIFT
>
> Also don't duplicate the values, so:
> #define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHIFT)
> at least where this is only BIT().
>
ACK
> > +#define MT6360_SHFT_FSLP (3)
> > +#define MT6360_MASK_HIZ BIT(2)
> > +#define MT6360_SHFT_HIZ (2)
> > +#define MT6360_MASK_OPA_MODE BIT(0)
> > +#define MT6360_SHFT_OPA_MODE (0)
> > +/* 0x12 */
> > +#define MT6360_MASK_TE BIT(4)
> > +#define MT6360_SHFT_TE (4)
> > +#define MT6360_MASK_IINLMTSEL GENMASK(3, 2)
> > +#define MT6360_SHFT_IINLMTSEL (2)
> > +#define MT6360_MASK_CHG_EN BIT(0)
> > +#define MT6360_SHFT_CHG_EN (0)
> > +/* 0x13 */
> > +#define MT6360_MASK_IAICR GENMASK(7, 2)
> > +#define MT6360_SHFT_IAICR (2)
> > +#define MT6360_MASK_ILIM_EN BIT(0)
> > +/* 0x14 */
> > +#define MT6360_MASK_VOREG GENMASK(7, 1)
> > +#define MT6360_SHFT_VOREG (1)
> > +/* 0x15 */
> > +#define MT6360_MASK_VOBST GENMASK(7, 2)
> > +/* 0x16 */
> > +#define MT6360_MASK_VMIVR GENMASK(7, 1)
> > +#define MT6360_SHFT_VMIVR (1)
> > +/* 0x17 */
> > +#define MT6360_MASK_ICHG GENMASK(7, 2)
> > +#define MT6360_SHFT_ICHG (2)
> > +/* 0x18 */
> > +#define MT6360_MASK_IPREC GENMASK(3, 0)
> > +#define MT6360_SHFT_IPREC (0)
> > +/* 0x19 */
> > +#define MT6360_MASK_IEOC GENMASK(7, 4)
> > +#define MT6360_SHFT_IEOC (4)
> > +/* 0x1A */
> > +#define MT6360_MASK_LBP GENMASK(7, 4)
> > +#define MT6360_SHFT_LBP (4)
> > +#define MT6360_MASK_OTG_OC GENMASK(3, 0)
> > +#define MT6360_SHFT_OTG_OC (0)
> > +/* 0x1B */
> > +#define MT6360_MASK_SYSREG GENMASK(4, 2)
> > +#define MT6360_SHFT_SYSREG (2)
> > +#define MT6360_MASK_VREC GENMASK(2, 0)
> > +#define MT6360_SHFT_VREC (0)
> > +/* 0x1C */
> > +#define MT6360_MASK_WT_FC GENMASK(7, 5)
> > +#define MT6360_SHFT_WT_FC (5)
> > +/* 0x1D */
> > +#define MT6360_MASK_CHG_WDT_EN BIT(7)
> > +#define MT6360_SHFT_CHG_WDT_EN (7)
> > +#define MT6360_MASK_CHG_WDT GENMASK(5, 4)
> > +#define MT6360_SHFT_CHG_WDT (4)
> > +/* 0x22 */
> > +#define MT6360_MASK_USBCHGEN BIT(7)
> > +#define MT6360_SHFT_USBCHGEN (7)
> > +/* 0x27 */
> > +#define MT6360_MASK_USB_STATUS GENMASK(6, 4)
> > +#define MT6360_SHFT_USB_STATUS (4)
> > +/* 0x2C */
> > +#define MT6360_MASK_BAT_COMP GENMASK(5, 3)
> > +#define MT6360_SHFT_BAT_COMP (3)
> > +#define MT6360_MASK_VCLAMP GENMASK(2, 0)
> > +#define MT6360_SHFT_VCLAMP (0)
> > +/* 0x4A */
> > +#define MT6360_MASK_CHG_STAT GENMASK(7, 6)
> > +#define MT6360_SHFT_CHG_STAT (6)
> > +#define MT6360_MASK_VBAT_LVL BIT(5)
> > +/* 0x61 */
> > +#define MT6360_MASK_VINOVP GENMASK(6, 5)
> > +#define MT6360_SHFT_VINOVP (5)
> > +/* 0xE7 */
> > +#define MT6360_MASK_CHRDET_EXT BIT(4)
> > +#define MT6360_SHFT_CHRDET_EXT (4)
> > +
> > +/* uA */
> > +#define MT6360_ICHG_MIN 100000
> > +#define MT6360_ICHG_MAX 5000000
> > +#define MT6360_ICHG_STEP 100000
> > +/* uV */
> > +#define MT6360_VOREG_MIN 3900000
> > +#define MT6360_VOREG_MAX 4710000
> > +#define MT6360_VOREG_STEP 10000
> > +/* uA */
> > +#define MT6360_AICR_MIN 100000
> > +#define MT6360_AICR_MAX 3250000
> > +#define MT6360_AICR_STEP 50000
> > +/* uA */
> > +#define MT6360_IPREC_MIN 100000
> > +#define MT6360_IPREC_MAX 850000
> > +#define MT6360_IPREC_STEP 50000
> > +/* uA */
> > +#define MT6360_IEOC_MIN 100000
> > +#define MT6360_IEOC_MAX 850000
> > +#define MT6360_IEOC_STEP 50000
> > +
> > +struct mt6360_chg_platform_data {
> > + u32 vinovp;
> > +};
> > +
> > +struct mt6360_chg_info {
> > + struct device *dev;
> > + struct mt6360_chg_platform_data *pdata;
> > + struct regmap *regmap;
> > + struct extcon_dev *edev;
> > + struct power_supply_desc psy_desc;
> > + struct power_supply *psy;
> > + struct regulator_desc otg_rdesc;
>
> This looks unused.
>
ACK, I will remove it.
> > + struct regulator_dev *otg_rdev;
> > + struct mutex chgdet_lock;
> > + bool pwr_rdy;
> > + bool bc12_en;
> > + int psy_usb_type;
> > + struct work_struct chrdet_work;
> > +};
> > +
> > +static struct mt6360_chg_platform_data def_platform_data = {
> > + .vinovp = 6500000,
> > +};
> > +
> > +struct mt6360_irq_desc {
> > + const char *name;
> > + irq_handler_t irq_handler;
> > +};
> > +
> > +enum mt6360_iinlmtsel {
> > + MT6360_IINLMTSEL_AICR_3250 = 0,
> > + MT6360_IINLMTSEL_CHG_TYPE,
> > + MT6360_IINLMTSEL_AICR,
> > + MT6360_IINLMTSEL_LOWER_LEVEL,
> > +};
> > +
> > +enum mt6360_pmu_chg_type {
> > + MT6360_CHG_TYPE_NOVBUS = 0,
> > + MT6360_CHG_TYPE_UNDER_GOING,
> > + MT6360_CHG_TYPE_SDP,
> > + MT6360_CHG_TYPE_SDPNSTD,
> > + MT6360_CHG_TYPE_DCP,
> > + MT6360_CHG_TYPE_CDP,
> > + MT6360_CHG_TYPE_MAX,
> > +};
> > +
> > +static enum power_supply_usb_type mt6360_charger_usb_types[] = {
> > + POWER_SUPPLY_USB_TYPE_UNKNOWN,
> > + POWER_SUPPLY_USB_TYPE_SDP,
> > + POWER_SUPPLY_USB_TYPE_DCP,
> > + POWER_SUPPLY_USB_TYPE_CDP,
> > + POWER_SUPPLY_USB_TYPE_C,
> > + POWER_SUPPLY_USB_TYPE_PD,
> > + POWER_SUPPLY_USB_TYPE_PD_DRP,
> > + POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID
> > +};
> > +
> > +static inline unsigned int mt6360_trans_reg_sel(u32 data, u32 min_val, u32 step,
> > + u32 max_sel)
>
> Drop all inlines.
>
ACK
> > +{
> > + unsigned int target = 0;
> > +
> > + if (data >= min_val)
> > + target = (data - min_val) / step;
> > + if (target > max_sel)
> > + target = max_sel;
> > + return target;
> > +}
> > +
> > +static inline int mt6360_get_chrdet_ext_stat(struct mt6360_chg_info *mci,
> > + bool *pwr_rdy)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_FOD_STAT, ®val);
> > + if (ret < 0)
> > + return ret;
> > + *pwr_rdy = (regval & MT6360_MASK_CHRDET_EXT) ? true : false;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_online(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + bool pwr_rdy;
> > +
> > + ret = mt6360_get_chrdet_ext_stat(mci, &pwr_rdy);
> > + if (ret < 0)
> > + return ret;
> > + val->intval = pwr_rdy ? true : false;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_status(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int status, ret;
> > + unsigned int regval;
> > + bool pwr_rdy;
> > +
> > + ret = mt6360_get_chrdet_ext_stat(mci, &pwr_rdy);
> > + if (ret < 0)
> > + return ret;
> > + if (!pwr_rdy) {
> > + status = POWER_SUPPLY_STATUS_DISCHARGING;
> > + goto out;
> > + }
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_STAT, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval &= MT6360_MASK_CHG_STAT;
> > + regval >>= MT6360_SHFT_CHG_STAT;
> > + switch (regval) {
> > + case 0x0:
> > + status = POWER_SUPPLY_STATUS_NOT_CHARGING;
> > + break;
> > + case 0x1:
> > + status = POWER_SUPPLY_STATUS_CHARGING;
> > + break;
> > + case 0x2:
> > + status = POWER_SUPPLY_STATUS_FULL;
> > + break;
> > + default:
> > + ret = -EIO;
> > + }
> > +out:
> > + if (!ret)
> > + val->intval = status;
> > + return ret;
> > +}
> > +
> > +static int mt6360_charger_get_charge_type(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int type, ret;
> > + unsigned int regval;
> > + u8 chg_stat;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_STAT, ®val);
> > + if (ret < 0)
> > + return ret;
> > + chg_stat = (regval & MT6360_MASK_CHG_STAT) >> MT6360_SHFT_CHG_STAT;
> > + switch (chg_stat) {
> > + case 0x00: /* Not Charging */
> > + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> > + break;
> > + case 0x01: /* Charge in Progress */
> > + if (regval & MT6360_MASK_VBAT_LVL)
> > + type = POWER_SUPPLY_CHARGE_TYPE_FAST;
> > + else
> > + type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> > + break;
> > + case 0x02: /* Charge Done */
> > + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> > + break;
> > + case 0x03: /* Charge Fault */
> > + type = POWER_SUPPLY_STATUS_UNKNOWN;
> > + break;
> > + default:
> > + break;
> > + }
> > + val->intval = type;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ichg, ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_MASK_ICHG) >> MT6360_SHFT_ICHG;
> > + ichg = MT6360_ICHG_MIN + (regval * MT6360_ICHG_STEP);
> > + if (ichg > MT6360_ICHG_MAX)
> > + ichg = MT6360_ICHG_MAX;
> > + val->intval = ichg;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_max_ichg(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + val->intval = MT6360_ICHG_MAX;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_cv(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int cv, ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_MASK_VOREG) >> MT6360_SHFT_VOREG;
> > + cv = MT6360_VOREG_MIN + (regval * MT6360_VOREG_STEP);
> > + if (cv > MT6360_VOREG_MAX)
> > + cv = MT6360_VOREG_MAX;
> > + val->intval = cv;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_max_cv(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + val->intval = MT6360_VOREG_MAX;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_aicr(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL3, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_MASK_IAICR) >> MT6360_SHFT_IAICR;
> > + val->intval = MT6360_AICR_MIN + (regval * MT6360_AICR_STEP);
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_iprechg(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL8, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_MASK_IPREC) >> MT6360_SHFT_IPREC;
> > + val->intval = MT6360_IPREC_MIN + (regval * MT6360_IPREC_STEP);
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_ieoc(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL9, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_MASK_IEOC) >> MT6360_SHFT_IEOC;
> > + val->intval = MT6360_IEOC_MIN + (regval * MT6360_IEOC_STEP);
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_set_online(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 force_sleep = val->intval ? 0 : 1;
> > +
> > + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL1,
> > + MT6360_MASK_FSLP,
> > + force_sleep << MT6360_SHFT_FSLP);
> > +}
> > +
> > +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + unsigned int regval;
> > +
> > + regval = mt6360_trans_reg_sel(val->intval, 100000, 100000, 0x31);
> > + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL7,
> > + MT6360_MASK_ICHG, regval << MT6360_SHFT_ICHG);
> > +}
> > +
> > +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + unsigned int regval;
> > +
> > + regval = mt6360_trans_reg_sel(val->intval, 3900000, 10000, 0x51);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL4,
> > + MT6360_MASK_VOREG,
> > + regval << MT6360_SHFT_VOREG);
> > +}
> > +
> > +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + unsigned int regval;
> > +
> > + regval = mt6360_trans_reg_sel(val->intval, 100000, 50000, 0x3F);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL3,
> > + MT6360_MASK_IAICR,
> > + regval << MT6360_SHFT_IAICR);
> > +}
> > +
> > +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + unsigned int regval;
> > +
> > + regval = mt6360_trans_reg_sel(val->intval, 100000, 50000, 0x0F);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL8,
> > + MT6360_MASK_IPREC,
> > + regval << MT6360_SHFT_IPREC);
> > +}
> > +
> > +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + unsigned int regval;
> > +
> > + regval = mt6360_trans_reg_sel(val->intval, 100000, 50000, 0x0F);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL9,
> > + MT6360_MASK_IEOC,
> > + regval << MT6360_SHFT_IEOC);
> > +}
> > +
> > +static int mt6360_charger_get_property(struct power_supply *psy,
> > + enum power_supply_property psp,
> > + union power_supply_propval *val)
> > +{
> > + struct mt6360_chg_info *mci = power_supply_get_drvdata(psy);
> > + int ret = 0;
> > +
> > + dev_dbg(mci->dev, "%s: prop = %d\n", __func__, psp);
> > + switch (psp) {
> > + case POWER_SUPPLY_PROP_ONLINE:
> > + ret = mt6360_charger_get_online(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_STATUS:
> > + ret = mt6360_charger_get_status(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CHARGE_TYPE:
> > + ret = mt6360_charger_get_charge_type(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
> > + ret = mt6360_charger_get_ichg(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
> > + ret = mt6360_charger_get_max_ichg(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
> > + ret = mt6360_charger_get_cv(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
> > + ret = mt6360_charger_get_max_cv(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
> > + ret = mt6360_charger_get_aicr(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
> > + ret = mt6360_charger_get_iprechg(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
> > + ret = mt6360_charger_get_ieoc(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_USB_TYPE:
> > + val->intval = mci->psy_usb_type;
> > + break;
> > + default:
> > + ret = -ENODATA;
> > + }
> > + return ret;
> > +}
> > +
> > +static int mt6360_charger_set_property(struct power_supply *psy,
> > + enum power_supply_property psp,
> > + const union power_supply_propval *val)
> > +{
> > + struct mt6360_chg_info *mci = power_supply_get_drvdata(psy);
> > + int ret;
> > +
> > + dev_dbg(mci->dev, "%s: prop = %d\n", __func__, psp);
> > + switch (psp) {
> > + case POWER_SUPPLY_PROP_ONLINE:
> > + ret = mt6360_charger_set_online(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
> > + ret = mt6360_charger_set_ichg(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
> > + ret = mt6360_charger_set_cv(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
> > + ret = mt6360_charger_set_aicr(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
> > + ret = mt6360_charger_set_iprechg(mci, val);
> > + break;
> > + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
> > + ret = mt6360_charger_set_ieoc(mci, val);
> > + break;
> > + default:
> > + ret = -EINVAL;
> > + }
> > + return ret;
> > +}
> > +
> > +static int mt6360_charger_property_is_writeable(struct power_supply *psy,
> > + enum power_supply_property psp)
> > +{
> > + switch (psp) {
> > + case POWER_SUPPLY_PROP_ONLINE:
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
> > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
> > + case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
> > + case POWER_SUPPLY_PROP_PRECHARGE_CURRENT:
> > + case POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT:
> > + return 1;
> > + default:
> > + return 0;
> > + }
> > +}
> > +
> > +static enum power_supply_property mt6360_charger_properties[] = {
> > + POWER_SUPPLY_PROP_ONLINE,
> > + POWER_SUPPLY_PROP_STATUS,
> > + POWER_SUPPLY_PROP_CHARGE_TYPE,
> > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
> > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
> > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
> > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
> > + POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
> > + POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
> > + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
> > + POWER_SUPPLY_PROP_USB_TYPE,
> > +};
> > +
> > +static char *mt6360_charger_supplied_to[] = {
> > + "main-battery"
> > +};
> > +
> > +static const struct power_supply_desc mt6360_charger_desc = {
> > + .type = POWER_SUPPLY_TYPE_USB,
> > + .properties = mt6360_charger_properties,
> > + .num_properties = ARRAY_SIZE(mt6360_charger_properties),
> > + .get_property = mt6360_charger_get_property,
> > + .set_property = mt6360_charger_set_property,
> > + .property_is_writeable = mt6360_charger_property_is_writeable,
> > + .usb_types = mt6360_charger_usb_types,
> > + .num_usb_types = ARRAY_SIZE(mt6360_charger_usb_types),
> > +};
> > +
> > +static const struct regulator_ops mt6360_chg_otg_ops = {
> > + .list_voltage = regulator_list_voltage_linear,
> > + .enable = regulator_enable_regmap,
> > + .disable = regulator_disable_regmap,
> > + .is_enabled = regulator_is_enabled_regmap,
> > + .set_voltage_sel = regulator_set_voltage_sel_regmap,
> > + .get_voltage_sel = regulator_get_voltage_sel_regmap,
> > +};
> > +
> > +static const struct regulator_desc mt6360_otg_rdesc = {
> > + .of_match = "usb-otg-vbus",
> > + .name = "usb-otg-vbus",
> > + .ops = &mt6360_chg_otg_ops,
> > + .owner = THIS_MODULE,
> > + .type = REGULATOR_VOLTAGE,
> > + .min_uV = 4425000,
> > + .uV_step = 25000, /* step 25mV */
> > + .n_voltages = 57, /* 4425mV to 5825mV */
> > + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> > + .vsel_mask = MT6360_MASK_VOBST,
> > + .enable_reg = MT6360_PMU_CHG_CTRL1,
> > + .enable_mask = MT6360_MASK_OPA_MODE,
> > +};
> > +
> > +static const unsigned int mt6360_extcon_cable[] = {
> > + EXTCON_USB,
> > + EXTCON_USB_HOST,
> > + EXTCON_CHG_USB_SDP,
> > + EXTCON_CHG_USB_DCP,
> > + EXTCON_CHG_USB_CDP,
> > + EXTCON_CHG_USB_SLOW, /* For NonStandard Charger */
> > + EXTCON_NONE,
> > +};
> > +
> > +static irqreturn_t mt6360_pmu_chg_treg_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_pwr_rdy_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_batsysuv_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_vsysuv_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_vsysov_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_vbatov_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_vbusov_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_warn(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_aiccmeasl_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_wdtmri_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_rechgi_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_termi_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chg_ieoci_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_pumpx_donei_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
>
> All this is looks bogus.
>
ACK
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > + int ret, chg_type = EXTCON_NONE;
> > + unsigned int usb_status;
> > + int last_usb_type;
> > +
> > + dev_dbg(mci->dev, "%s\n", __func__);
> > + mutex_lock(&mci->chgdet_lock);
> > + if (!mci->bc12_en) {
> > + dev_info(mci->dev, "%s: bc12 disabled, ignore irq\n", __func__);
> > + goto out;
> > + }
> > + last_usb_type = mci->psy_usb_type;
> > + /* Plug in */
> > + ret = regmap_read(mci->regmap, MT6360_PMU_USB_STATUS1, &usb_status);
> > + if (ret < 0)
> > + goto out;
> > + usb_status &= MT6360_MASK_USB_STATUS;
> > + usb_status >>= MT6360_SHFT_USB_STATUS;
> > + switch (usb_status) {
> > + case MT6360_CHG_TYPE_UNDER_GOING:
> > + dev_info(mci->dev, "%s: under going...\n", __func__);
> > + goto out;
> > + case MT6360_CHG_TYPE_SDP:
> > + chg_type = EXTCON_CHG_USB_SDP;
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> > + break;
> > + case MT6360_CHG_TYPE_SDPNSTD:
> > + chg_type = EXTCON_CHG_USB_SLOW;
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> > + break;
> > + case MT6360_CHG_TYPE_CDP:
> > + chg_type = EXTCON_CHG_USB_CDP;
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
> > + break;
> > + case MT6360_CHG_TYPE_DCP:
> > + chg_type = EXTCON_CHG_USB_DCP;
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
> > + break;
> > + default:
> > + dev_warn(mci->dev,
> > + "%s: disconnect or unknown status\n", __func__);
> > + goto out;
> > + }
> > +
> > + dev_info(mci->dev, "%s: chg_type = %d\n", __func__, chg_type);
> > + if (chg_type == EXTCON_CHG_USB_SDP || chg_type == EXTCON_CHG_USB_CDP) {
> > + extcon_set_state_sync(mci->edev, EXTCON_USB_HOST, false);
> > + extcon_set_state_sync(mci->edev, EXTCON_USB, true);
> > + }
> > + extcon_set_state_sync(mci->edev, chg_type, true);
> > + if (last_usb_type != mci->psy_usb_type)
> > + power_supply_changed(mci->psy);
> > +out:
> > + mutex_unlock(&mci->chgdet_lock);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static void mt6360_handle_chrdet_ext_evt(struct mt6360_chg_info *mci)
> > +{
> > + int i, ret;
> > + bool pwr_rdy;
> > + int last_usb_type;
> > +
> > + mutex_lock(&mci->chgdet_lock);
> > + ret = mt6360_get_chrdet_ext_stat(mci, &pwr_rdy);
> > + if (ret < 0)
> > + goto out;
> > + if (mci->pwr_rdy == pwr_rdy) {
> > + dev_info(mci->dev,
> > + "%s: pwr_rdy is same(%d)\n", __func__, pwr_rdy);
> > + goto out;
> > + }
> > + mci->pwr_rdy = pwr_rdy;
> > + last_usb_type = mci->psy_usb_type;
> > + dev_info(mci->dev, "%s: pwr_rdy = %d\n", __func__, pwr_rdy);
> > + if (!pwr_rdy) {
> > + for (i = 0; i < ARRAY_SIZE(mt6360_extcon_cable) - 1; i++) {
> > + extcon_set_state_sync(mci->edev,
> > + mt6360_extcon_cable[i], false);
> > + }
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> > + if (last_usb_type != mci->psy_usb_type)
> > + power_supply_changed(mci->psy);
> > +
> > + }
> > + ret = regmap_update_bits(mci->regmap,
> > + MT6360_PMU_DEVICE_TYPE,
> > + MT6360_MASK_USBCHGEN,
> > + pwr_rdy ? MT6360_MASK_USBCHGEN : 0);
> > + if (ret < 0)
> > + goto out;
> > + mci->bc12_en = pwr_rdy;
> > +out:
> > + mutex_unlock(&mci->chgdet_lock);
> > +}
> > +
> > +static void mt6360_chrdet_work(struct work_struct *work)
> > +{
> > + struct mt6360_chg_info *mci = (struct mt6360_chg_info *)container_of(
> > + work, struct mt6360_chg_info, chrdet_work);
> > +
> > + dev_info(mci->dev, "%s\n", __func__);
> > + mt6360_handle_chrdet_ext_evt(mci);
> > +}
> > +
> > +static irqreturn_t mt6360_pmu_chrdet_ext_evt_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > +
> > + dev_info(mci->dev, "%s\n", __func__);
> > + mt6360_handle_chrdet_ext_evt(mci);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static const struct mt6360_irq_desc mt6360_chg_irq_desc[] = {
> > + { "chg_treg_evt", mt6360_pmu_chg_treg_evt_handler },
> > + { "pwr_rdy_evt", mt6360_pmu_pwr_rdy_evt_handler },
> > + { "chg_batsysuv_evt", mt6360_pmu_chg_batsysuv_evt_handler },
> > + { "chg_vsysuv_evt", mt6360_pmu_chg_vsysuv_evt_handler },
> > + { "chg_vsysov_evt", mt6360_pmu_chg_vsysov_evt_handler },
> > + { "chg_vbatov_evt", mt6360_pmu_chg_vbatov_evt_handler },
> > + { "chg_vbusov_evt", mt6360_pmu_chg_vbusov_evt_handler },
> > + { "chg_aiccmeasl", mt6360_pmu_chg_aiccmeasl_handler },
> > + { "wdtmri", mt6360_pmu_wdtmri_handler },
> > + { "chg_rechgi", mt6360_pmu_chg_rechgi_handler },
> > + { "chg_termi", mt6360_pmu_chg_termi_handler },
> > + { "chg_ieoci", mt6360_pmu_chg_ieoci_handler },
> > + { "pumpx_donei", mt6360_pmu_pumpx_donei_handler },
> > + { "attach_i", mt6360_pmu_attach_i_handler },
> > + { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler },
> > +};
> > +
> > +static int mt6360_chg_irq_register(struct platform_device *pdev)
> > +{
> > + const struct mt6360_irq_desc *irq_desc;
> > + int i, irq, ret;
> > +
> > + for (i = 0; i < ARRAY_SIZE(mt6360_chg_irq_desc); i++) {
> > + irq_desc = mt6360_chg_irq_desc + i;
> > + if (unlikely(!irq_desc->name))
> > + continue;
>
> Can this happen?
>
No, I will remove it.
> > + irq = platform_get_irq_byname(pdev, irq_desc->name);
>
> Interrupts were not described in the bindings.
>
I add resource when MFD driver add sub-device. Should I add something
in dt-binding?
ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_AUTO,
mt6360_devs,
ARRAY_SIZE(mt6360_devs), NULL, 0,
regmap_irq_get_domain(ddata->irq_data));
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"),
> > + if (irq < 0)
> > + continue;
> > + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
> > + irq_desc->irq_handler,
> > + IRQF_TRIGGER_FALLING,
> > + irq_desc->name,
> > + platform_get_drvdata(pdev));
>
> Why you use handler thread per each interrupt? This should be rather one
> handler. Especially that most of your handlers do nothing.
>
I will remove serveral irqs which is do nothing, and only keep
chrdet_ext for power ready and attachi for bc12 done.
I add serveral resources in MFD device.
Do you mean I use IRQF_SHARED to reduce irq?
> > + if (ret < 0) {
> > + dev_err(&pdev->dev,
> > + "request %s irq fail\n", irq_desc->name);
> > + return ret;
> > + }
> > + }
> > + return 0;
> > +}
> > +
> > +struct mt6360_field_info {
> > + struct device_attribute dev_attr;
> > + u8 reg;
> > + u8 mask;
> > + u8 shft;
> > +};
> > +
> > +static ssize_t mt6360_sysfs_show(struct device *dev,
> > + struct device_attribute *attr, char *buf);
> > +static ssize_t mt6360_sysfs_store(struct device *dev,
> > + struct device_attribute *attr, const char *buf, size_t count);
> > +
> > +#define MT6360_FIELD_RW(_name, _reg, _nbit) \
> > +{ \
> > + .dev_attr = __ATTR(_name, 0664, \
> > + mt6360_sysfs_show, mt6360_sysfs_store), \
> > + .reg = MT6360_PMU_##_reg, \
> > + .mask = MT6360_MASK_##_nbit, \
> > + .shft = MT6360_SHFT_##_nbit, \
> > +}
> > +
> > +#define MT6360_FIELD_RO(_name, _reg, _nbit) \
> > +{ \
> > + .dev_attr = __ATTR(_name, 0444, \
> > + mt6360_sysfs_show, NULL), \
> > + .reg = MT6360_PMU_##_reg, \
> > + .mask = MT6360_MASK_##_nbit, \
> > + .shft = MT6360_SHFT_##_nbit, \
> > +}
> > +
> > +static struct mt6360_field_info mt6360_field_tbl[] = {
> > + MT6360_FIELD_RW(hiz, CHG_CTRL1, HIZ),
> > + MT6360_FIELD_RW(vmivr, CHG_CTRL6, VMIVR),
> > + MT6360_FIELD_RW(iaicr, CHG_CTRL3, IAICR),
> > + MT6360_FIELD_RW(SYSREG, CHG_CTRL11, SYSREG),
> > + MT6360_FIELD_RW(otg_oc, CHG_CTRL10, OTG_OC),
> > + MT6360_FIELD_RW(ichg, CHG_CTRL17, ICHG),
> > + MT6360_FIELD_RW(iprec, CHG_CTRL8, IPREC),
> > + MT6360_FIELD_RW(ieoc, CHG_CTRL9, IEOC),
> > + MT6360_FIELD_RW(voreg, CHG_CTRL4, VOREG),
> > + MT6360_FIELD_RW(lbp, CHG_CTRL10, LBP),
> > + MT6360_FIELD_RW(vrec, CHG_CTRL11, VREC),
> > + MT6360_FIELD_RW(te, CHG_CTRL2, TE),
> > + MT6360_FIELD_RW(chg_wdt_en, CHG_CTRL13, CHG_WDT_EN),
> > + MT6360_FIELD_RW(chg_wdt, CHG_CTRL13, CHG_WDT),
> > + MT6360_FIELD_RW(wt_fc, CHG_CTRL12, WT_FC),
> > + MT6360_FIELD_RW(bat_comp, CHG_CTRL18, BAT_COMP),
> > + MT6360_FIELD_RW(vclamp, CHG_CTRL18, VCLAMP),
> > + MT6360_FIELD_RW(usbchgen, DEVICE_TYPE, USBCHGEN),
> > + MT6360_FIELD_RW(chg_en, CHG_CTRL2, CHG_EN),
> > + MT6360_FIELD_RO(chrdet_ext, FOD_STAT, CHRDET_EXT),
> > +};
> > +
> > +static struct attribute *mt6360_attrs[ARRAY_SIZE(mt6360_field_tbl) + 1];
> > +
> > +static const struct attribute_group mt6360_attr_group = {
> > + .attrs = mt6360_attrs,
> > +};
> > +
> > +static ssize_t mt6360_sysfs_show(struct device *dev,
> > + struct device_attribute *attr, char *buf)
> > +{
> > + struct mt6360_chg_info *mci = dev_get_drvdata(dev->parent);
> > + struct mt6360_field_info *info = (void *)attr;
> > + unsigned int regval;
> > + int ret;
> > +
> > + ret = regmap_read(mci->regmap, info->reg, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & info->mask) >> info->shft;
> > + return scnprintf(buf, PAGE_SIZE, "%02x\n", regval);
> > +}
> > +
> > +static ssize_t mt6360_sysfs_store(struct device *dev,
> > + struct device_attribute *attr, const char *buf, size_t count)
> > +{
> > + struct mt6360_chg_info *mci = dev_get_drvdata(dev->parent);
> > + struct mt6360_field_info *info = (void *)attr;
> > + int ret, tmp;
> > +
> > + if (kstrtoint(buf, 10, &tmp) < 0) {
> > + dev_err(dev, "failed to parsing number\n");
> > + return -EINVAL;
> > + }
> > + ret = regmap_update_bits(mci->regmap,
> > + info->reg, info->mask, tmp << info->shft);
> > + if (ret < 0)
> > + return ret;
> > + return count;
> > +}
> > +
> > +static int mt6360_sysfs_create_group(struct mt6360_chg_info *mci)
> > +{
> > + int i, tb_size = ARRAY_SIZE(mt6360_field_tbl);
> > +
> > + for (i = 0; i < tb_size; i++)
> > + mt6360_attrs[i] = &(mt6360_field_tbl[i].dev_attr.attr);
> > + return devm_device_add_group(&mci->psy->dev, &mt6360_attr_group);
> > +}
> > +
> > +static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
> > +{
> > + int ret;
> > +
> > + /* Disable bc12 */
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
> > + MT6360_MASK_USBCHGEN, 0);
> > + if (ret < 0) {
> > + dev_err(mci->dev, "%s: disable bc12 fail\n", __func__);
> > + goto out;
> > + }
> > + /* Set input current limit select by AICR */
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
> > + MT6360_MASK_IINLMTSEL,
> > + MT6360_IINLMTSEL_AICR <<
> > + MT6360_SHFT_IINLMTSEL);
> > + if (ret < 0) {
> > + dev_err(mci->dev,
> > + "%s: switch iinlmtsel to aicr fail\n", __func__);
> > + goto out;
> > + }
> > + usleep_range(5000, 6000);
> > + /* Disable ilim */
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
> > + MT6360_MASK_ILIM_EN, 0);
> > + if (ret < 0) {
> > + dev_err(mci->dev,
> > + "%s: switch iinlmtsel to aicr fail\n", __func__);
> > + goto out;
> > + }
> > + /* Enlarge OTG_OC to max 3A */
> > + ret = regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL10, 0x07, 0x07);
> > + if (ret < 0) {
> > + dev_err(mci->dev,
> > + "%s: faled config otg oc to maximum\n", __func__);
> > + }
> > +out:
> > + return ret;
> > +}
> > +
> > +static u32 mt6360_vinovp_trans_to_sel(u32 val)
> > +{
> > + u32 vinovp_tbl[] = { 5500000, 6500000, 11000000, 14500000 };
> > + int i;
> > +
> > + /* Select the smaller and equal supported value */
> > + for (i = 0; i < ARRAY_SIZE(vinovp_tbl)-1; i++) {
> > + if (val < vinovp_tbl[i+1])
> > + break;
> > + }
> > + return i;
> > +}
> > +
> > +static struct mt6360_chg_platform_data *mt6360_parse_pdata(
> > + struct platform_device *pdev)
> > +{
> > + struct mt6360_chg_platform_data *pdata = dev_get_platdata(&pdev->dev);
> > + struct device_node *np = pdev->dev.of_node;
> > + int ret;
> > +
> > + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
> > + if (!pdata)
> > + return ERR_PTR(-ENOMEM);
> > + memcpy(pdata, &def_platform_data, sizeof(*pdata));
>
> Use kmemdup or something similar.
>
ACK
> > + ret = of_property_read_u32(np, "vinovp", &pdata->vinovp);
> > + if (ret) {
> > + dev_err(&pdev->dev, "failed to parse vinovp in DT\n");
> > + return ERR_PTR(ret);
> > + }
> > + return pdata;
> > +}
> > +
> > +static int mt6360_apply_pdata(struct platform_device *pdev)
> > +{
> > + struct mt6360_chg_platform_data *pdata = dev_get_platdata(&pdev->dev);
> > + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> > + int ret;
> > + u32 sel;
> > +
> > + sel = mt6360_vinovp_trans_to_sel(pdata->vinovp);
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
> > + MT6360_MASK_VINOVP, sel << MT6360_SHFT_VINOVP);
> > + if (ret)
> > + return ret;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_probe(struct platform_device *pdev)
> > +{
> > + struct mt6360_chg_platform_data *pdata = dev_get_platdata(&pdev->dev);
> > + struct mt6360_chg_info *mci;
> > + struct power_supply_config charger_cfg = {};
> > + struct regulator_config config = { };
> > + int ret;
> > +
> > + mci = devm_kzalloc(&pdev->dev, sizeof(*mci), GFP_KERNEL);
> > + if (!mci)
> > + return -ENOMEM;
> > +
> > + pdata = mt6360_parse_pdata(pdev);
> > + if (IS_ERR_OR_NULL(pdata))
> > + return PTR_ERR(pdata);
> > +
> > + pdev->dev.platform_data = pdata;
> > +
> > + mci->dev = &pdev->dev;
> > + mutex_init(&mci->chgdet_lock);
> > + platform_set_drvdata(pdev, mci);
> > + INIT_WORK(&mci->chrdet_work, &mt6360_chrdet_work);
> > +
> > + mci->regmap = dev_get_regmap(pdev->dev.parent, NULL);
> > + if (!mci->regmap) {
> > + dev_err(&pdev->dev, "Failed to get parent regmap\n");
> > + return -ENODEV;
> > + }
> > +
> > + ret = mt6360_apply_pdata(pdev);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to apply pdata\n");
> > + return ret;
> > + }
> > +
> > + mci->edev = devm_extcon_dev_allocate(&pdev->dev, mt6360_extcon_cable);
> > + if (IS_ERR(mci->edev)) {
> > + dev_err(&pdev->dev, "Failed to allocate memory for extcon\n");
> > + return -ENOMEM;
> > + }
> > +
> > + ret = devm_extcon_dev_register(&pdev->dev, mci->edev);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to register extcon dev\n");
> > + return ret;
> > + }
> > +
> > + memcpy(&mci->psy_desc, &mt6360_charger_desc, sizeof(mci->psy_desc));
> > + mci->psy_desc.name = dev_name(&pdev->dev);
> > + charger_cfg.drv_data = mci;
> > + charger_cfg.of_node = pdev->dev.of_node;
> > + charger_cfg.supplied_to = mt6360_charger_supplied_to;
> > + charger_cfg.num_supplicants = ARRAY_SIZE(mt6360_charger_supplied_to);
> > + mci->psy = devm_power_supply_register(&pdev->dev,
> > + &mci->psy_desc, &charger_cfg);
> > + if (IS_ERR(mci->psy)) {
> > + dev_err(&pdev->dev, "Failed to register power supply dev\n");
> > + return PTR_ERR(mci->psy);
> > + }
> > +
> > + ret = mt6360_chg_init_setting(mci);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to initial setting\n");
> > + return ret;
> > + }
> > +
> > + schedule_work(&mci->chrdet_work);
> > +
> > + ret = mt6360_chg_irq_register(pdev);
> > + if (ret) {
> > + dev_err(&pdev->dev, "Failed to register irqs\n");
> > + return ret;
> > + }
> > +
> > + config.dev = &pdev->dev;
> > + config.regmap = mci->regmap;
> > + mci->otg_rdev = devm_regulator_register(&pdev->dev, &mt6360_otg_rdesc,
> > + &config);
> > + if (IS_ERR(mci->otg_rdev))
> > + return PTR_ERR(mci->otg_rdev);
> > +
> > + ret = mt6360_sysfs_create_group(mci);
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "%s: create sysfs attrs fail\n", __func__);
> > + return ret;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id __maybe_unused mt6360_charger_of_id[] = {
> > + { .compatible = "mediatek,mt6360-chg", },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(of, mt6360_charger_of_id);
> > +
> > +static const struct platform_device_id mt6360_charger_id[] = {
> > + { "mt6360-chg", 0 },
> > + {},
> > +};
> > +MODULE_DEVICE_TABLE(platform, mt6360_charger_id);
> > +
> > +static struct platform_driver mt6360_charger_driver = {
> > + .driver = {
> > + .name = "mt6360-chg",
> > + .owner = THIS_MODULE,
>
> Not needed. You did not run coccinelle, right?
>
> > + .of_match_table = of_match_ptr(mt6360_charger_of_id),
> > + },
> > + .probe = mt6360_charger_probe,
> > + .id_table = mt6360_charger_id,
> > +};
> > +module_platform_driver(mt6360_charger_driver);
> > +
> > +MODULE_AUTHOR("CY_Huang <cy_huang@...htek.com>");
> > +MODULE_DESCRIPTION("MT6360 Charger Driver");
> > +MODULE_LICENSE("GPL");
> > +MODULE_VERSION("1.0.0");
>
> Skip version.
>
>
ACK
> All these comments were after looking briefly - I did not perform a
> thorough review. I am surprised that you combined regulator and charger
> driver in one. It is doable but makes driver bigger and more difficult
> to maintain. Consider splitting them.
>
MT6360 charger is switching charger, Can I keep regulator for boost
OTG like bq24190?
> Best regards,
> Krzysztof
Powered by blists - more mailing lists