This patch series add MT6360 Charger support contains driver and binding
document
Gene Chen (2)
dt-bindings: power: Add bindings document for Charger support on MT6360 PMIC
power: supply: mt6360_charger: add MT6360 charger support
Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml | 48
drivers/power/supply/Kconfig | 10
drivers/power/supply/Makefile | 1
drivers/power/supply/mt6360_charger.c | 914 ++++++++++
4 files changed, 973 insertions(+)
changelogs between v1 & v2
- Add binding property with unit and custom name prefix
- Remove extcon device, redundant brackets and interrupts
- Fix power supply prop "charger type"
changelogs between v2 & v3
- Add register selector to value mapping
changelogs between v3 & v4
- move pdata vinovp to mt6360_chg_info
- remove unuse sysfs attribute
- refactor debug log and warning
- add power supply prop input voltage limit
From: Gene Chen <[email protected]>
Add basic support for the battery charger for MT6360 PMIC
Signed-off-by: Gene Chen <[email protected]>
---
drivers/power/supply/Kconfig | 10 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/mt6360_charger.c | 914 ++++++++++++++++++++++++++++++++++
3 files changed, 925 insertions(+)
create mode 100644 drivers/power/supply/mt6360_charger.c
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index eec646c..dd63bed 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -567,6 +567,16 @@ 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
+ depends on REGULATOR
+ help
+ Say Y here to enable MT6360 Charger Part.
+ The device supports High-Accuracy Voltage/Current Regulation,
+ 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 dd4b863..9bd0804 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..d80bdad
--- /dev/null
+++ b/drivers/power/supply/mt6360_charger.c
@@ -0,0 +1,914 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2021 MediaTek Inc.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
+#include <linux/regulator/driver.h>
+
+#define MT6360_PMU_CHG_CTRL1 0x311
+#define MT6360_PMU_CHG_CTRL2 0x312
+#define MT6360_PMU_CHG_CTRL3 0x313
+#define MT6360_PMU_CHG_CTRL4 0x314
+#define MT6360_PMU_CHG_CTRL5 0x315
+#define MT6360_PMU_CHG_CTRL6 0x316
+#define MT6360_PMU_CHG_CTRL7 0x317
+#define MT6360_PMU_CHG_CTRL8 0x318
+#define MT6360_PMU_CHG_CTRL9 0x319
+#define MT6360_PMU_CHG_CTRL10 0x31A
+#define MT6360_PMU_DEVICE_TYPE 0x322
+#define MT6360_PMU_USB_STATUS1 0x327
+#define MT6360_PMU_CHG_STAT 0x34A
+#define MT6360_PMU_CHG_CTRL19 0x361
+#define MT6360_PMU_FOD_STAT 0x3E7
+
+/* MT6360_PMU_CHG_CTRL1 */
+#define MT6360_FSLP_SHFT (3)
+#define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHFT)
+#define MT6360_OPA_MODE_SHFT (0)
+#define MT6360_OPA_MODE_MASK BIT(MT6360_OPA_MODE_SHFT)
+/* MT6360_PMU_CHG_CTRL2 */
+#define MT6360_IINLMTSEL_SHFT (2)
+#define MT6360_IINLMTSEL_MASK GENMASK(3, 2)
+/* MT6360_PMU_CHG_CTRL3 */
+#define MT6360_IAICR_SHFT (2)
+#define MT6360_IAICR_MASK GENMASK(7, 2)
+#define MT6360_ILIM_EN_MASK BIT(0)
+/* MT6360_PMU_CHG_CTRL4 */
+#define MT6360_VOREG_SHFT (1)
+#define MT6360_VOREG_MASK GENMASK(7, 1)
+/* MT6360_PMU_CHG_CTRL5 */
+#define MT6360_VOBST_MASK GENMASK(7, 2)
+/* MT6360_PMU_CHG_CTRL6 */
+#define MT6360_VMIVR_SHFT (1)
+#define MT6360_VMIVR_MASK GENMASK(7, 1)
+/* MT6360_PMU_CHG_CTRL7 */
+#define MT6360_ICHG_SHFT (2)
+#define MT6360_ICHG_MASK GENMASK(7, 2)
+/* MT6360_PMU_CHG_CTRL8 */
+#define MT6360_IPREC_SHFT (0)
+#define MT6360_IPREC_MASK GENMASK(3, 0)
+/* MT6360_PMU_CHG_CTRL9 */
+#define MT6360_IEOC_SHFT (4)
+#define MT6360_IEOC_MASK GENMASK(7, 4)
+/* MT6360_PMU_CHG_CTRL10 */
+#define MT6360_OTG_OC_MASK GENMASK(3, 0)
+/* MT6360_PMU_DEVICE_TYPE */
+#define MT6360_USBCHGEN_MASK BIT(7)
+/* MT6360_PMU_USB_STATUS1 */
+#define MT6360_USB_STATUS_SHFT (4)
+#define MT6360_USB_STATUS_MASK GENMASK(6, 4)
+/* MT6360_PMU_CHG_STAT */
+#define MT6360_CHG_STAT_SHFT (6)
+#define MT6360_CHG_STAT_MASK GENMASK(7, 6)
+#define MT6360_VBAT_LVL_MASK BIT(5)
+/* MT6360_PMU_CHG_CTRL19 */
+#define MT6360_VINOVP_SHFT (5)
+#define MT6360_VINOVP_MASK GENMASK(6, 5)
+/* MT6360_PMU_FOD_STAT */
+#define MT6360_CHRDET_EXT_MASK BIT(4)
+
+/* uV */
+#define MT6360_VMIVR_MIN 3900000
+#define MT6360_VMIVR_MAX 13400000
+#define MT6360_VMIVR_STEP 100000
+/* 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_info {
+ struct device *dev;
+ struct regmap *regmap;
+ struct power_supply_desc psy_desc;
+ struct power_supply *psy;
+ struct regulator_dev *otg_rdev;
+ struct mutex chgdet_lock;
+ u32 vinovp;
+ bool pwr_rdy;
+ bool bc12_en;
+ int psy_usb_type;
+ struct work_struct chrdet_work;
+};
+
+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_DISABLE_BC12,
+ 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,
+};
+
+static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max, u32 step)
+{
+ u32 target = 0, max_sel;
+
+ if (data >= min) {
+ target = (data - min) / step;
+ max_sel = (max - min) / step;
+ if (target > max_sel)
+ target = max_sel;
+ }
+ return target;
+}
+
+static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
+{
+ u32 target = 0;
+
+ target = min + (sel * step);
+ if (target > max)
+ target = max;
+ return target;
+}
+
+static 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_CHRDET_EXT_MASK) ? 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_CHG_STAT_MASK;
+ regval >>= MT6360_CHG_STAT_SHFT;
+ 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_CHG_STAT_MASK) >> MT6360_CHG_STAT_SHFT;
+ switch (chg_stat) {
+ case 0x01: /* Charge in Progress */
+ if (regval & MT6360_VBAT_LVL_MASK)
+ type = POWER_SUPPLY_CHARGE_TYPE_FAST;
+ else
+ type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+ break;
+ case 0x00: /* Not Charging */
+ case 0x02: /* Charge Done */
+ case 0x03: /* Charge Fault */
+ default:
+ type = POWER_SUPPLY_CHARGE_TYPE_NONE;
+ break;
+ }
+
+ val->intval = type;
+ return 0;
+}
+
+static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
+ union power_supply_propval *val)
+{
+ int ret;
+ unsigned int regval;
+
+ ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
+ if (ret < 0)
+ return ret;
+ regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_ICHG_MIN,
+ MT6360_ICHG_MAX,
+ MT6360_ICHG_STEP);
+ 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 ret;
+ unsigned int regval;
+
+ ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
+ if (ret < 0)
+ return ret;
+ regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_VOREG_MIN,
+ MT6360_VOREG_MAX,
+ MT6360_VOREG_STEP);
+ 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_AICR_MIN,
+ MT6360_AICR_MAX,
+ MT6360_AICR_STEP);
+ return 0;
+}
+
+static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
+ union power_supply_propval *val)
+{
+ int ret;
+ unsigned int regval;
+
+ ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
+ if (ret < 0)
+ return ret;
+ regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_VMIVR_MIN,
+ MT6360_VMIVR_MAX,
+ MT6360_VMIVR_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_IPREC_MASK) >> MT6360_IPREC_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_IPREC_MIN,
+ MT6360_IPREC_MAX,
+ 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
+ val->intval = mt6360_map_real_val(regval,
+ MT6360_IEOC_MIN,
+ MT6360_IEOC_MAX,
+ 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_FSLP_MASK,
+ force_sleep << MT6360_FSLP_SHFT);
+}
+
+static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_ICHG_MIN,
+ MT6360_ICHG_MAX,
+ MT6360_ICHG_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL7,
+ MT6360_ICHG_MASK,
+ sel << MT6360_ICHG_SHFT);
+}
+
+static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_VOREG_MIN,
+ MT6360_VOREG_MAX,
+ MT6360_VOREG_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL4,
+ MT6360_VOREG_MASK,
+ sel << MT6360_VOREG_SHFT);
+}
+
+static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_AICR_MIN,
+ MT6360_AICR_MAX,
+ MT6360_AICR_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL3,
+ MT6360_IAICR_MASK,
+ sel << MT6360_IAICR_SHFT);
+}
+
+static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_VMIVR_MIN,
+ MT6360_VMIVR_MAX,
+ MT6360_VMIVR_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL3,
+ MT6360_VMIVR_MASK,
+ sel << MT6360_VMIVR_SHFT);
+}
+
+static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_IPREC_MIN,
+ MT6360_IPREC_MAX,
+ MT6360_IPREC_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL8,
+ MT6360_IPREC_MASK,
+ sel << MT6360_IPREC_SHFT);
+}
+
+static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
+ const union power_supply_propval *val)
+{
+ u8 sel;
+
+ sel = mt6360_map_reg_sel(val->intval,
+ MT6360_IEOC_MIN,
+ MT6360_IEOC_MAX,
+ MT6360_IEOC_STEP);
+ return regmap_update_bits(mci->regmap,
+ MT6360_PMU_CHG_CTRL9,
+ MT6360_IEOC_MASK,
+ sel << MT6360_IEOC_SHFT);
+}
+
+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;
+
+ 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_INPUT_VOLTAGE_LIMIT:
+ ret = mt6360_charger_get_mivr(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;
+
+ 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_INPUT_VOLTAGE_LIMIT:
+ ret = mt6360_charger_set_mivr(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_INPUT_VOLTAGE_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_INPUT_VOLTAGE_LIMIT,
+ POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
+ POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
+ POWER_SUPPLY_PROP_USB_TYPE,
+};
+
+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,
+ .n_voltages = 57,
+ .vsel_reg = MT6360_PMU_CHG_CTRL5,
+ .vsel_mask = MT6360_VOBST_MASK,
+ .enable_reg = MT6360_PMU_CHG_CTRL1,
+ .enable_mask = MT6360_OPA_MODE_MASK,
+};
+
+static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
+{
+ struct mt6360_chg_info *mci = data;
+ int ret;
+ unsigned int usb_status;
+ int last_usb_type;
+
+ mutex_lock(&mci->chgdet_lock);
+ if (!mci->bc12_en) {
+ dev_warn(mci->dev, "Received attach interrupt, bc12 disabled, ignore irq\n");
+ 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_USB_STATUS_MASK;
+ usb_status >>= MT6360_USB_STATUS_SHFT;
+ switch (usb_status) {
+ case MT6360_CHG_TYPE_NOVBUS:
+ dev_dbg(mci->dev, "Received attach interrupt, no vbus\n");
+ goto out;
+ case MT6360_CHG_TYPE_UNDER_GOING:
+ dev_dbg(mci->dev, "Received attach interrupt, under going...\n");
+ goto out;
+ case MT6360_CHG_TYPE_SDP:
+ mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
+ break;
+ case MT6360_CHG_TYPE_SDPNSTD:
+ mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
+ break;
+ case MT6360_CHG_TYPE_CDP:
+ mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
+ break;
+ case MT6360_CHG_TYPE_DCP:
+ mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
+ break;
+ case MT6360_CHG_TYPE_DISABLE_BC12:
+ dev_dbg(mci->dev, "Received attach interrupt, bc12 detect not enable\n");
+ goto out;
+ default:
+ dev_dbg(mci->dev, "Received attach interrupt, reserved address\n");
+ goto out;
+ }
+
+ dev_dbg(mci->dev, "Received attach interrupt, chg_type = %d\n", mci->psy_usb_type);
+ 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 ret;
+ bool pwr_rdy;
+
+ 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_dbg(mci->dev, "Received vbus interrupt, pwr_rdy is same(%d)\n", pwr_rdy);
+ goto out;
+ }
+ mci->pwr_rdy = pwr_rdy;
+ dev_dbg(mci->dev, "Received vbus interrupt, pwr_rdy = %d\n", pwr_rdy);
+ if (!pwr_rdy) {
+ mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
+ power_supply_changed(mci->psy);
+
+ }
+ ret = regmap_update_bits(mci->regmap,
+ MT6360_PMU_DEVICE_TYPE,
+ MT6360_USBCHGEN_MASK,
+ pwr_rdy ? MT6360_USBCHGEN_MASK : 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);
+
+ 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;
+
+ mt6360_handle_chrdet_ext_evt(mci);
+ return IRQ_HANDLED;
+}
+
+static int mt6360_chg_irq_register(struct platform_device *pdev)
+{
+ const struct {
+ const char *name;
+ irq_handler_t handler;
+ } irq_descs[] = {
+ { "attach_i", mt6360_pmu_attach_i_handler },
+ { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler }
+ };
+ int i, ret;
+
+ for (i = 0; i < ARRAY_SIZE(irq_descs); i++) {
+ ret = platform_get_irq_byname(pdev, irq_descs[i].name);
+ if (ret < 0)
+ return ret;
+
+ ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
+ irq_descs[i].handler,
+ IRQF_TRIGGER_FALLING,
+ irq_descs[i].name,
+ platform_get_drvdata(pdev));
+ if (ret < 0)
+ return dev_err_probe(&pdev->dev, ret, "Failed to request %s irq\n",
+ irq_descs[i].name);
+ }
+
+ return 0;
+}
+
+struct mt6360_field_info {
+ struct device_attribute dev_attr;
+ u16 reg;
+ u8 mask;
+ u8 shft;
+};
+
+static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
+{
+ int ret;
+
+ ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
+ MT6360_USBCHGEN_MASK, 0);
+ if (ret)
+ return dev_err_probe(mci->dev, ret, "%s: Failed to disable bc12\n", __func__);
+ ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
+ MT6360_IINLMTSEL_MASK,
+ MT6360_IINLMTSEL_AICR <<
+ MT6360_IINLMTSEL_SHFT);
+ if (ret)
+ return dev_err_probe(mci->dev, ret,
+ "%s: Failed to switch iinlmtsel to aicr\n", __func__);
+ usleep_range(5000, 6000);
+ ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
+ MT6360_ILIM_EN_MASK, 0);
+ if (ret)
+ return dev_err_probe(mci->dev, ret,
+ "%s: Failed to disable ilim\n", __func__);
+ ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL10,
+ MT6360_OTG_OC_MASK, MT6360_OTG_OC_MASK);
+ if (ret)
+ return dev_err_probe(mci->dev, ret,
+ "%s: Failed to config otg oc to 3A\n", __func__);
+ return 0;
+}
+
+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 int mt6360_parse_dt(struct platform_device *pdev)
+{
+ struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ ret = device_property_read_u32(&pdev->dev, "richtek,vinovp-microvolt", &mci->vinovp);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to parse vinovp in DT\n");
+ return ret;
+}
+
+static int mt6360_apply_dt(struct platform_device *pdev)
+{
+ struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
+ u32 sel;
+
+ sel = mt6360_vinovp_trans_to_sel(mci->vinovp);
+ return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
+ MT6360_VINOVP_MASK, sel << MT6360_VINOVP_SHFT);
+}
+
+static int mt6360_charger_probe(struct platform_device *pdev)
+{
+ 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;
+
+ ret = mt6360_parse_dt(pdev);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to parse dt\n");
+
+ mci->dev = &pdev->dev;
+ mci->vinovp = 6500000;
+ 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)
+ return dev_err_probe(&pdev->dev, -ENODEV, "Failed to get parent regmap\n");
+
+ ret = mt6360_apply_dt(pdev);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to apply dt\n");
+
+ 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;
+ mci->psy = devm_power_supply_register(&pdev->dev,
+ &mci->psy_desc, &charger_cfg);
+ if (IS_ERR(mci->psy))
+ return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
+ "Failed to register power supply dev\n");
+
+ ret = mt6360_chg_init_setting(mci);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to initial setting\n");
+
+ schedule_work(&mci->chrdet_work);
+
+ ret = mt6360_chg_irq_register(pdev);
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to register irqs\n");
+
+ 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);
+
+ 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",
+ .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("Gene Chen <[email protected]>");
+MODULE_DESCRIPTION("MT6360 Charger Driver");
+MODULE_LICENSE("GPL");
--
2.7.4
From: Gene Chen <[email protected]>
Add bindings document for Charger support on MT6360 PMIC
Signed-off-by: Gene Chen <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
.../bindings/power/supply/mt6360_charger.yaml | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml
diff --git a/Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml b/Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml
new file mode 100644
index 0000000..b89b15a
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/power/supply/mt6360_charger.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Battery charger driver for MT6360 PMIC from MediaTek Integrated.
+
+maintainers:
+ - Gene Chen <[email protected]>
+
+description: |
+ This module is part of the MT6360 MFD device.
+ Provides Battery Charger, Boost for OTG devices and BC1.2 detection.
+
+properties:
+ compatible:
+ const: mediatek,mt6360-chg
+
+ richtek,vinovp-microvolt:
+ description: Maximum CHGIN regulation voltage in uV.
+ enum: [ 5500000, 6500000, 11000000, 14500000 ]
+
+
+ usb-otg-vbus-regulator:
+ type: object
+ description: OTG boost regulator.
+ $ref: /schemas/regulator/regulator.yaml#
+
+required:
+ - compatible
+
+additionalProperties: false
+
+examples:
+ - |
+ mt6360_charger: charger {
+ compatible = "mediatek,mt6360-chg";
+ richtek,vinovp-microvolt = <14500000>;
+
+ otg_vbus_regulator: usb-otg-vbus-regulator {
+ regulator-compatible = "usb-otg-vbus";
+ regulator-name = "usb-otg-vbus";
+ regulator-min-microvolt = <4425000>;
+ regulator-max-microvolt = <5825000>;
+ };
+ };
+...
--
2.7.4
Gene Chen <[email protected]> 於 2021年1月18日 週一 下午8:42寫道：
>
> From: Gene Chen <[email protected]>
>
> Add basic support for the battery charger for MT6360 PMIC
>
> Signed-off-by: Gene Chen <[email protected]>
> ---
> drivers/power/supply/Kconfig | 10 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/mt6360_charger.c | 914 ++++++++++++++++++++++++++++++++++
> 3 files changed, 925 insertions(+)
> create mode 100644 drivers/power/supply/mt6360_charger.c
>
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index eec646c..dd63bed 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -567,6 +567,16 @@ 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
> + depends on REGULATOR
> + help
> + Say Y here to enable MT6360 Charger Part.
> + The device supports High-Accuracy Voltage/Current Regulation,
> + 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 dd4b863..9bd0804 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..d80bdad
> --- /dev/null
> +++ b/drivers/power/supply/mt6360_charger.c
> @@ -0,0 +1,914 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2021 MediaTek Inc.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/power_supply.h>
> +#include <linux/property.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/driver.h>
> +
> +#define MT6360_PMU_CHG_CTRL1 0x311
> +#define MT6360_PMU_CHG_CTRL2 0x312
> +#define MT6360_PMU_CHG_CTRL3 0x313
> +#define MT6360_PMU_CHG_CTRL4 0x314
> +#define MT6360_PMU_CHG_CTRL5 0x315
> +#define MT6360_PMU_CHG_CTRL6 0x316
> +#define MT6360_PMU_CHG_CTRL7 0x317
> +#define MT6360_PMU_CHG_CTRL8 0x318
> +#define MT6360_PMU_CHG_CTRL9 0x319
> +#define MT6360_PMU_CHG_CTRL10 0x31A
> +#define MT6360_PMU_DEVICE_TYPE 0x322
> +#define MT6360_PMU_USB_STATUS1 0x327
> +#define MT6360_PMU_CHG_STAT 0x34A
> +#define MT6360_PMU_CHG_CTRL19 0x361
> +#define MT6360_PMU_FOD_STAT 0x3E7
> +
> +/* MT6360_PMU_CHG_CTRL1 */
> +#define MT6360_FSLP_SHFT (3)
> +#define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHFT)
> +#define MT6360_OPA_MODE_SHFT (0)
> +#define MT6360_OPA_MODE_MASK BIT(MT6360_OPA_MODE_SHFT)
> +/* MT6360_PMU_CHG_CTRL2 */
> +#define MT6360_IINLMTSEL_SHFT (2)
> +#define MT6360_IINLMTSEL_MASK GENMASK(3, 2)
> +/* MT6360_PMU_CHG_CTRL3 */
> +#define MT6360_IAICR_SHFT (2)
> +#define MT6360_IAICR_MASK GENMASK(7, 2)
> +#define MT6360_ILIM_EN_MASK BIT(0)
> +/* MT6360_PMU_CHG_CTRL4 */
> +#define MT6360_VOREG_SHFT (1)
> +#define MT6360_VOREG_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL5 */
> +#define MT6360_VOBST_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL6 */
> +#define MT6360_VMIVR_SHFT (1)
> +#define MT6360_VMIVR_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL7 */
> +#define MT6360_ICHG_SHFT (2)
> +#define MT6360_ICHG_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL8 */
> +#define MT6360_IPREC_SHFT (0)
> +#define MT6360_IPREC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_CHG_CTRL9 */
> +#define MT6360_IEOC_SHFT (4)
> +#define MT6360_IEOC_MASK GENMASK(7, 4)
> +/* MT6360_PMU_CHG_CTRL10 */
> +#define MT6360_OTG_OC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_DEVICE_TYPE */
> +#define MT6360_USBCHGEN_MASK BIT(7)
> +/* MT6360_PMU_USB_STATUS1 */
> +#define MT6360_USB_STATUS_SHFT (4)
> +#define MT6360_USB_STATUS_MASK GENMASK(6, 4)
> +/* MT6360_PMU_CHG_STAT */
> +#define MT6360_CHG_STAT_SHFT (6)
> +#define MT6360_CHG_STAT_MASK GENMASK(7, 6)
> +#define MT6360_VBAT_LVL_MASK BIT(5)
> +/* MT6360_PMU_CHG_CTRL19 */
> +#define MT6360_VINOVP_SHFT (5)
> +#define MT6360_VINOVP_MASK GENMASK(6, 5)
> +/* MT6360_PMU_FOD_STAT */
> +#define MT6360_CHRDET_EXT_MASK BIT(4)
> +
> +/* uV */
> +#define MT6360_VMIVR_MIN 3900000
> +#define MT6360_VMIVR_MAX 13400000
> +#define MT6360_VMIVR_STEP 100000
> +/* 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_info {
> + struct device *dev;
> + struct regmap *regmap;
> + struct power_supply_desc psy_desc;
> + struct power_supply *psy;
> + struct regulator_dev *otg_rdev;
> + struct mutex chgdet_lock;
> + u32 vinovp;
> + bool pwr_rdy;
> + bool bc12_en;
> + int psy_usb_type;
> + struct work_struct chrdet_work;
> +};
> +
> +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_DISABLE_BC12,
> + 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,
> +};
> +
> +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0, max_sel;
> +
> + if (data >= min) {
> + target = (data - min) / step;
> + max_sel = (max - min) / step;
> + if (target > max_sel)
> + target = max_sel;
> + }
> + return target;
> +}
> +
> +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0;
> +
> + target = min + (sel * step);
> + if (target > max)
> + target = max;
> + return target;
> +}
> +
> +static 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_CHRDET_EXT_MASK) ? 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_CHG_STAT_MASK;
> + regval >>= MT6360_CHG_STAT_SHFT;
> + 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_CHG_STAT_MASK) >> MT6360_CHG_STAT_SHFT;
> + switch (chg_stat) {
> + case 0x01: /* Charge in Progress */
> + if (regval & MT6360_VBAT_LVL_MASK)
> + type = POWER_SUPPLY_CHARGE_TYPE_FAST;
> + else
> + type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> + break;
> + case 0x00: /* Not Charging */
> + case 0x02: /* Charge Done */
> + case 0x03: /* Charge Fault */
> + default:
> + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> + break;
> + }
> +
> + val->intval = type;
> + return 0;
> +}
> +
> +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + 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 ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return 0;
> +}
> +
> +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + 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_FSLP_MASK,
> + force_sleep << MT6360_FSLP_SHFT);
> +}
> +
> +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL7,
> + MT6360_ICHG_MASK,
> + sel << MT6360_ICHG_SHFT);
> +}
> +
> +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL4,
> + MT6360_VOREG_MASK,
> + sel << MT6360_VOREG_SHFT);
> +}
> +
> +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_IAICR_MASK,
> + sel << MT6360_IAICR_SHFT);
> +}
> +
> +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_VMIVR_MASK,
> + sel << MT6360_VMIVR_SHFT);
> +}
> +
> +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + MT6360_IPREC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL8,
> + MT6360_IPREC_MASK,
> + sel << MT6360_IPREC_SHFT);
> +}
> +
> +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + MT6360_IEOC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL9,
> + MT6360_IEOC_MASK,
> + sel << MT6360_IEOC_SHFT);
> +}
> +
> +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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_get_mivr(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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_set_mivr(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_INPUT_VOLTAGE_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_INPUT_VOLTAGE_LIMIT,
> + POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
> + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
> + POWER_SUPPLY_PROP_USB_TYPE,
> +};
> +
> +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,
> + .n_voltages = 57,
> + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> + .vsel_mask = MT6360_VOBST_MASK,
> + .enable_reg = MT6360_PMU_CHG_CTRL1,
> + .enable_mask = MT6360_OPA_MODE_MASK,
> +};
> +
> +static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
> +{
> + struct mt6360_chg_info *mci = data;
> + int ret;
> + unsigned int usb_status;
> + int last_usb_type;
> +
> + mutex_lock(&mci->chgdet_lock);
> + if (!mci->bc12_en) {
> + dev_warn(mci->dev, "Received attach interrupt, bc12 disabled, ignore irq\n");
> + 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_USB_STATUS_MASK;
> + usb_status >>= MT6360_USB_STATUS_SHFT;
> + switch (usb_status) {
> + case MT6360_CHG_TYPE_NOVBUS:
> + dev_dbg(mci->dev, "Received attach interrupt, no vbus\n");
> + goto out;
> + case MT6360_CHG_TYPE_UNDER_GOING:
> + dev_dbg(mci->dev, "Received attach interrupt, under going...\n");
> + goto out;
> + case MT6360_CHG_TYPE_SDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_SDPNSTD:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_CDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
> + break;
> + case MT6360_CHG_TYPE_DCP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
> + break;
> + case MT6360_CHG_TYPE_DISABLE_BC12:
> + dev_dbg(mci->dev, "Received attach interrupt, bc12 detect not enable\n");
> + goto out;
> + default:
> + dev_dbg(mci->dev, "Received attach interrupt, reserved address\n");
> + goto out;
> + }
> +
> + dev_dbg(mci->dev, "Received attach interrupt, chg_type = %d\n", mci->psy_usb_type);
> + 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 ret;
> + bool pwr_rdy;
> +
> + 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_dbg(mci->dev, "Received vbus interrupt, pwr_rdy is same(%d)\n", pwr_rdy);
> + goto out;
> + }
> + mci->pwr_rdy = pwr_rdy;
> + dev_dbg(mci->dev, "Received vbus interrupt, pwr_rdy = %d\n", pwr_rdy);
> + if (!pwr_rdy) {
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> + power_supply_changed(mci->psy);
> +
> + }
> + ret = regmap_update_bits(mci->regmap,
> + MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK,
> + pwr_rdy ? MT6360_USBCHGEN_MASK : 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);
> +
> + 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;
> +
> + mt6360_handle_chrdet_ext_evt(mci);
> + return IRQ_HANDLED;
> +}
> +
> +static int mt6360_chg_irq_register(struct platform_device *pdev)
> +{
> + const struct {
> + const char *name;
> + irq_handler_t handler;
> + } irq_descs[] = {
> + { "attach_i", mt6360_pmu_attach_i_handler },
> + { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler }
> + };
> + int i, ret;
> +
> + for (i = 0; i < ARRAY_SIZE(irq_descs); i++) {
> + ret = platform_get_irq_byname(pdev, irq_descs[i].name);
> + if (ret < 0)
> + return ret;
> +
> + ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
> + irq_descs[i].handler,
> + IRQF_TRIGGER_FALLING,
> + irq_descs[i].name,
> + platform_get_drvdata(pdev));
> + if (ret < 0)
> + return dev_err_probe(&pdev->dev, ret, "Failed to request %s irq\n",
> + irq_descs[i].name);
> + }
> +
> + return 0;
> +}
> +
> +struct mt6360_field_info {
> + struct device_attribute dev_attr;
> + u16 reg;
> + u8 mask;
> + u8 shft;
> +};
> +
> +static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
> +{
> + int ret;
> +
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret, "%s: Failed to disable bc12\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
> + MT6360_IINLMTSEL_MASK,
> + MT6360_IINLMTSEL_AICR <<
> + MT6360_IINLMTSEL_SHFT);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to switch iinlmtsel to aicr\n", __func__);
> + usleep_range(5000, 6000);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
> + MT6360_ILIM_EN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to disable ilim\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL10,
> + MT6360_OTG_OC_MASK, MT6360_OTG_OC_MASK);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to config otg oc to 3A\n", __func__);
> + return 0;
> +}
> +
> +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 int mt6360_parse_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + int ret;
> +
> + ret = device_property_read_u32(&pdev->dev, "richtek,vinovp-microvolt", &mci->vinovp);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse vinovp in DT\n");
> + return ret;
> +}
> +
> +static int mt6360_apply_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + u32 sel;
> +
> + sel = mt6360_vinovp_trans_to_sel(mci->vinovp);
> + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
> + MT6360_VINOVP_MASK, sel << MT6360_VINOVP_SHFT);
> +}
> +
> +static int mt6360_charger_probe(struct platform_device *pdev)
> +{
> + 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;
> +
> + ret = mt6360_parse_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse dt\n");
> +
> + mci->dev = &pdev->dev;
> + mci->vinovp = 6500000;
> + 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)
> + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to get parent regmap\n");
> +
> + ret = mt6360_apply_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to apply dt\n");
> +
> + 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;
> + mci->psy = devm_power_supply_register(&pdev->dev,
> + &mci->psy_desc, &charger_cfg);
> + if (IS_ERR(mci->psy))
> + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> + "Failed to register power supply dev\n");
> +
> + ret = mt6360_chg_init_setting(mci);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to initial setting\n");
> +
> + schedule_work(&mci->chrdet_work);
> +
> + ret = mt6360_chg_irq_register(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to register irqs\n");
> +
> + 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);
> +
> + 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",
> + .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("Gene Chen <[email protected]>");
> +MODULE_DESCRIPTION("MT6360 Charger Driver");
> +MODULE_LICENSE("GPL");
> --
> 2.7.4
>
Dear Reviewers,
Is there any change I can fix, please let me know, thanks
Gene Chen <[email protected]> 於 2021年3月2日 週二 下午3:27寫道：
>
> Gene Chen <[email protected]> 於 2021年1月18日 週一 下午8:42寫道：
> >
> > From: Gene Chen <[email protected]>
> >
> > Add basic support for the battery charger for MT6360 PMIC
> >
> > Signed-off-by: Gene Chen <[email protected]>
> > ---
> > drivers/power/supply/Kconfig | 10 +
> > drivers/power/supply/Makefile | 1 +
> > drivers/power/supply/mt6360_charger.c | 914 ++++++++++++++++++++++++++++++++++
> > 3 files changed, 925 insertions(+)
> > create mode 100644 drivers/power/supply/mt6360_charger.c
> >
> > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> > index eec646c..dd63bed 100644
> > --- a/drivers/power/supply/Kconfig
> > +++ b/drivers/power/supply/Kconfig
> > @@ -567,6 +567,16 @@ 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
> > + depends on REGULATOR
> > + help
> > + Say Y here to enable MT6360 Charger Part.
> > + The device supports High-Accuracy Voltage/Current Regulation,
> > + 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 dd4b863..9bd0804 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..d80bdad
> > --- /dev/null
> > +++ b/drivers/power/supply/mt6360_charger.c
> > @@ -0,0 +1,914 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (c) 2021 MediaTek Inc.
> > + */
> > +
> > +#include <linux/init.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/power_supply.h>
> > +#include <linux/property.h>
> > +#include <linux/regmap.h>
> > +#include <linux/regulator/driver.h>
> > +
> > +#define MT6360_PMU_CHG_CTRL1 0x311
> > +#define MT6360_PMU_CHG_CTRL2 0x312
> > +#define MT6360_PMU_CHG_CTRL3 0x313
> > +#define MT6360_PMU_CHG_CTRL4 0x314
> > +#define MT6360_PMU_CHG_CTRL5 0x315
> > +#define MT6360_PMU_CHG_CTRL6 0x316
> > +#define MT6360_PMU_CHG_CTRL7 0x317
> > +#define MT6360_PMU_CHG_CTRL8 0x318
> > +#define MT6360_PMU_CHG_CTRL9 0x319
> > +#define MT6360_PMU_CHG_CTRL10 0x31A
> > +#define MT6360_PMU_DEVICE_TYPE 0x322
> > +#define MT6360_PMU_USB_STATUS1 0x327
> > +#define MT6360_PMU_CHG_STAT 0x34A
> > +#define MT6360_PMU_CHG_CTRL19 0x361
> > +#define MT6360_PMU_FOD_STAT 0x3E7
> > +
> > +/* MT6360_PMU_CHG_CTRL1 */
> > +#define MT6360_FSLP_SHFT (3)
> > +#define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHFT)
> > +#define MT6360_OPA_MODE_SHFT (0)
> > +#define MT6360_OPA_MODE_MASK BIT(MT6360_OPA_MODE_SHFT)
> > +/* MT6360_PMU_CHG_CTRL2 */
> > +#define MT6360_IINLMTSEL_SHFT (2)
> > +#define MT6360_IINLMTSEL_MASK GENMASK(3, 2)
> > +/* MT6360_PMU_CHG_CTRL3 */
> > +#define MT6360_IAICR_SHFT (2)
> > +#define MT6360_IAICR_MASK GENMASK(7, 2)
> > +#define MT6360_ILIM_EN_MASK BIT(0)
> > +/* MT6360_PMU_CHG_CTRL4 */
> > +#define MT6360_VOREG_SHFT (1)
> > +#define MT6360_VOREG_MASK GENMASK(7, 1)
> > +/* MT6360_PMU_CHG_CTRL5 */
> > +#define MT6360_VOBST_MASK GENMASK(7, 2)
> > +/* MT6360_PMU_CHG_CTRL6 */
> > +#define MT6360_VMIVR_SHFT (1)
> > +#define MT6360_VMIVR_MASK GENMASK(7, 1)
> > +/* MT6360_PMU_CHG_CTRL7 */
> > +#define MT6360_ICHG_SHFT (2)
> > +#define MT6360_ICHG_MASK GENMASK(7, 2)
> > +/* MT6360_PMU_CHG_CTRL8 */
> > +#define MT6360_IPREC_SHFT (0)
> > +#define MT6360_IPREC_MASK GENMASK(3, 0)
> > +/* MT6360_PMU_CHG_CTRL9 */
> > +#define MT6360_IEOC_SHFT (4)
> > +#define MT6360_IEOC_MASK GENMASK(7, 4)
> > +/* MT6360_PMU_CHG_CTRL10 */
> > +#define MT6360_OTG_OC_MASK GENMASK(3, 0)
> > +/* MT6360_PMU_DEVICE_TYPE */
> > +#define MT6360_USBCHGEN_MASK BIT(7)
> > +/* MT6360_PMU_USB_STATUS1 */
> > +#define MT6360_USB_STATUS_SHFT (4)
> > +#define MT6360_USB_STATUS_MASK GENMASK(6, 4)
> > +/* MT6360_PMU_CHG_STAT */
> > +#define MT6360_CHG_STAT_SHFT (6)
> > +#define MT6360_CHG_STAT_MASK GENMASK(7, 6)
> > +#define MT6360_VBAT_LVL_MASK BIT(5)
> > +/* MT6360_PMU_CHG_CTRL19 */
> > +#define MT6360_VINOVP_SHFT (5)
> > +#define MT6360_VINOVP_MASK GENMASK(6, 5)
> > +/* MT6360_PMU_FOD_STAT */
> > +#define MT6360_CHRDET_EXT_MASK BIT(4)
> > +
> > +/* uV */
> > +#define MT6360_VMIVR_MIN 3900000
> > +#define MT6360_VMIVR_MAX 13400000
> > +#define MT6360_VMIVR_STEP 100000
> > +/* 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_info {
> > + struct device *dev;
> > + struct regmap *regmap;
> > + struct power_supply_desc psy_desc;
> > + struct power_supply *psy;
> > + struct regulator_dev *otg_rdev;
> > + struct mutex chgdet_lock;
> > + u32 vinovp;
> > + bool pwr_rdy;
> > + bool bc12_en;
> > + int psy_usb_type;
> > + struct work_struct chrdet_work;
> > +};
> > +
> > +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_DISABLE_BC12,
> > + 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,
> > +};
> > +
> > +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max, u32 step)
> > +{
> > + u32 target = 0, max_sel;
> > +
> > + if (data >= min) {
> > + target = (data - min) / step;
> > + max_sel = (max - min) / step;
> > + if (target > max_sel)
> > + target = max_sel;
> > + }
> > + return target;
> > +}
> > +
> > +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> > +{
> > + u32 target = 0;
> > +
> > + target = min + (sel * step);
> > + if (target > max)
> > + target = max;
> > + return target;
> > +}
> > +
> > +static 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_CHRDET_EXT_MASK) ? 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_CHG_STAT_MASK;
> > + regval >>= MT6360_CHG_STAT_SHFT;
> > + 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_CHG_STAT_MASK) >> MT6360_CHG_STAT_SHFT;
> > + switch (chg_stat) {
> > + case 0x01: /* Charge in Progress */
> > + if (regval & MT6360_VBAT_LVL_MASK)
> > + type = POWER_SUPPLY_CHARGE_TYPE_FAST;
> > + else
> > + type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> > + break;
> > + case 0x00: /* Not Charging */
> > + case 0x02: /* Charge Done */
> > + case 0x03: /* Charge Fault */
> > + default:
> > + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> > + break;
> > + }
> > +
> > + val->intval = type;
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_ICHG_MIN,
> > + MT6360_ICHG_MAX,
> > + MT6360_ICHG_STEP);
> > + 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 ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_VOREG_MIN,
> > + MT6360_VOREG_MAX,
> > + MT6360_VOREG_STEP);
> > + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_AICR_MIN,
> > + MT6360_AICR_MAX,
> > + MT6360_AICR_STEP);
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_VMIVR_MIN,
> > + MT6360_VMIVR_MAX,
> > + MT6360_VMIVR_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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_IPREC_MIN,
> > + MT6360_IPREC_MAX,
> > + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_IEOC_MIN,
> > + MT6360_IEOC_MAX,
> > + 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_FSLP_MASK,
> > + force_sleep << MT6360_FSLP_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_ICHG_MIN,
> > + MT6360_ICHG_MAX,
> > + MT6360_ICHG_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL7,
> > + MT6360_ICHG_MASK,
> > + sel << MT6360_ICHG_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_VOREG_MIN,
> > + MT6360_VOREG_MAX,
> > + MT6360_VOREG_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL4,
> > + MT6360_VOREG_MASK,
> > + sel << MT6360_VOREG_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_AICR_MIN,
> > + MT6360_AICR_MAX,
> > + MT6360_AICR_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL3,
> > + MT6360_IAICR_MASK,
> > + sel << MT6360_IAICR_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_VMIVR_MIN,
> > + MT6360_VMIVR_MAX,
> > + MT6360_VMIVR_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL3,
> > + MT6360_VMIVR_MASK,
> > + sel << MT6360_VMIVR_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_IPREC_MIN,
> > + MT6360_IPREC_MAX,
> > + MT6360_IPREC_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL8,
> > + MT6360_IPREC_MASK,
> > + sel << MT6360_IPREC_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_IEOC_MIN,
> > + MT6360_IEOC_MAX,
> > + MT6360_IEOC_STEP);
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL9,
> > + MT6360_IEOC_MASK,
> > + sel << MT6360_IEOC_SHFT);
> > +}
> > +
> > +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;
> > +
> > + 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_INPUT_VOLTAGE_LIMIT:
> > + ret = mt6360_charger_get_mivr(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;
> > +
> > + 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_INPUT_VOLTAGE_LIMIT:
> > + ret = mt6360_charger_set_mivr(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_INPUT_VOLTAGE_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_INPUT_VOLTAGE_LIMIT,
> > + POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
> > + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
> > + POWER_SUPPLY_PROP_USB_TYPE,
> > +};
> > +
> > +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,
> > + .n_voltages = 57,
> > + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> > + .vsel_mask = MT6360_VOBST_MASK,
> > + .enable_reg = MT6360_PMU_CHG_CTRL1,
> > + .enable_mask = MT6360_OPA_MODE_MASK,
> > +};
> > +
> > +static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
> > +{
> > + struct mt6360_chg_info *mci = data;
> > + int ret;
> > + unsigned int usb_status;
> > + int last_usb_type;
> > +
> > + mutex_lock(&mci->chgdet_lock);
> > + if (!mci->bc12_en) {
> > + dev_warn(mci->dev, "Received attach interrupt, bc12 disabled, ignore irq\n");
> > + 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_USB_STATUS_MASK;
> > + usb_status >>= MT6360_USB_STATUS_SHFT;
> > + switch (usb_status) {
> > + case MT6360_CHG_TYPE_NOVBUS:
> > + dev_dbg(mci->dev, "Received attach interrupt, no vbus\n");
> > + goto out;
> > + case MT6360_CHG_TYPE_UNDER_GOING:
> > + dev_dbg(mci->dev, "Received attach interrupt, under going...\n");
> > + goto out;
> > + case MT6360_CHG_TYPE_SDP:
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> > + break;
> > + case MT6360_CHG_TYPE_SDPNSTD:
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> > + break;
> > + case MT6360_CHG_TYPE_CDP:
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
> > + break;
> > + case MT6360_CHG_TYPE_DCP:
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
> > + break;
> > + case MT6360_CHG_TYPE_DISABLE_BC12:
> > + dev_dbg(mci->dev, "Received attach interrupt, bc12 detect not enable\n");
> > + goto out;
> > + default:
> > + dev_dbg(mci->dev, "Received attach interrupt, reserved address\n");
> > + goto out;
> > + }
> > +
> > + dev_dbg(mci->dev, "Received attach interrupt, chg_type = %d\n", mci->psy_usb_type);
> > + 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 ret;
> > + bool pwr_rdy;
> > +
> > + 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_dbg(mci->dev, "Received vbus interrupt, pwr_rdy is same(%d)\n", pwr_rdy);
> > + goto out;
> > + }
> > + mci->pwr_rdy = pwr_rdy;
> > + dev_dbg(mci->dev, "Received vbus interrupt, pwr_rdy = %d\n", pwr_rdy);
> > + if (!pwr_rdy) {
> > + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> > + power_supply_changed(mci->psy);
> > +
> > + }
> > + ret = regmap_update_bits(mci->regmap,
> > + MT6360_PMU_DEVICE_TYPE,
> > + MT6360_USBCHGEN_MASK,
> > + pwr_rdy ? MT6360_USBCHGEN_MASK : 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);
> > +
> > + 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;
> > +
> > + mt6360_handle_chrdet_ext_evt(mci);
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int mt6360_chg_irq_register(struct platform_device *pdev)
> > +{
> > + const struct {
> > + const char *name;
> > + irq_handler_t handler;
> > + } irq_descs[] = {
> > + { "attach_i", mt6360_pmu_attach_i_handler },
> > + { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler }
> > + };
> > + int i, ret;
> > +
> > + for (i = 0; i < ARRAY_SIZE(irq_descs); i++) {
> > + ret = platform_get_irq_byname(pdev, irq_descs[i].name);
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
> > + irq_descs[i].handler,
> > + IRQF_TRIGGER_FALLING,
> > + irq_descs[i].name,
> > + platform_get_drvdata(pdev));
> > + if (ret < 0)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to request %s irq\n",
> > + irq_descs[i].name);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +struct mt6360_field_info {
> > + struct device_attribute dev_attr;
> > + u16 reg;
> > + u8 mask;
> > + u8 shft;
> > +};
> > +
> > +static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
> > +{
> > + int ret;
> > +
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
> > + MT6360_USBCHGEN_MASK, 0);
> > + if (ret)
> > + return dev_err_probe(mci->dev, ret, "%s: Failed to disable bc12\n", __func__);
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
> > + MT6360_IINLMTSEL_MASK,
> > + MT6360_IINLMTSEL_AICR <<
> > + MT6360_IINLMTSEL_SHFT);
> > + if (ret)
> > + return dev_err_probe(mci->dev, ret,
> > + "%s: Failed to switch iinlmtsel to aicr\n", __func__);
> > + usleep_range(5000, 6000);
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
> > + MT6360_ILIM_EN_MASK, 0);
> > + if (ret)
> > + return dev_err_probe(mci->dev, ret,
> > + "%s: Failed to disable ilim\n", __func__);
> > + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL10,
> > + MT6360_OTG_OC_MASK, MT6360_OTG_OC_MASK);
> > + if (ret)
> > + return dev_err_probe(mci->dev, ret,
> > + "%s: Failed to config otg oc to 3A\n", __func__);
> > + return 0;
> > +}
> > +
> > +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 int mt6360_parse_dt(struct platform_device *pdev)
> > +{
> > + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> > + int ret;
> > +
> > + ret = device_property_read_u32(&pdev->dev, "richtek,vinovp-microvolt", &mci->vinovp);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to parse vinovp in DT\n");
> > + return ret;
> > +}
> > +
> > +static int mt6360_apply_dt(struct platform_device *pdev)
> > +{
> > + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> > + u32 sel;
> > +
> > + sel = mt6360_vinovp_trans_to_sel(mci->vinovp);
> > + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
> > + MT6360_VINOVP_MASK, sel << MT6360_VINOVP_SHFT);
> > +}
> > +
> > +static int mt6360_charger_probe(struct platform_device *pdev)
> > +{
> > + 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;
> > +
> > + ret = mt6360_parse_dt(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to parse dt\n");
> > +
> > + mci->dev = &pdev->dev;
> > + mci->vinovp = 6500000;
> > + 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)
> > + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to get parent regmap\n");
> > +
> > + ret = mt6360_apply_dt(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to apply dt\n");
> > +
> > + 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;
> > + mci->psy = devm_power_supply_register(&pdev->dev,
> > + &mci->psy_desc, &charger_cfg);
> > + if (IS_ERR(mci->psy))
> > + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> > + "Failed to register power supply dev\n");
> > +
> > + ret = mt6360_chg_init_setting(mci);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to initial setting\n");
> > +
> > + schedule_work(&mci->chrdet_work);
> > +
> > + ret = mt6360_chg_irq_register(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to register irqs\n");
> > +
> > + 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);
> > +
> > + 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",
> > + .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("Gene Chen <[email protected]>");
> > +MODULE_DESCRIPTION("MT6360 Charger Driver");
> > +MODULE_LICENSE("GPL");
> > --
> > 2.7.4
> >
>
> Dear Reviewers,
> Is there any change I can fix, please let me know, thanks
Is there any update?
On 18/01/2021 13:41, Gene Chen wrote:
> From: Gene Chen <[email protected]>
>
> Add basic support for the battery charger for MT6360 PMIC
>
> Signed-off-by: Gene Chen <[email protected]>
Sebastian, can you have a look on that patch please?
Regards,
Matthias
> ---
> drivers/power/supply/Kconfig | 10 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/mt6360_charger.c | 914 ++++++++++++++++++++++++++++++++++
> 3 files changed, 925 insertions(+)
> create mode 100644 drivers/power/supply/mt6360_charger.c
>
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index eec646c..dd63bed 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -567,6 +567,16 @@ 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
> + depends on REGULATOR
> + help
> + Say Y here to enable MT6360 Charger Part.
> + The device supports High-Accuracy Voltage/Current Regulation,
> + 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 dd4b863..9bd0804 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..d80bdad
> --- /dev/null
> +++ b/drivers/power/supply/mt6360_charger.c
> @@ -0,0 +1,914 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2021 MediaTek Inc.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/power_supply.h>
> +#include <linux/property.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/driver.h>
> +
> +#define MT6360_PMU_CHG_CTRL1 0x311
> +#define MT6360_PMU_CHG_CTRL2 0x312
> +#define MT6360_PMU_CHG_CTRL3 0x313
> +#define MT6360_PMU_CHG_CTRL4 0x314
> +#define MT6360_PMU_CHG_CTRL5 0x315
> +#define MT6360_PMU_CHG_CTRL6 0x316
> +#define MT6360_PMU_CHG_CTRL7 0x317
> +#define MT6360_PMU_CHG_CTRL8 0x318
> +#define MT6360_PMU_CHG_CTRL9 0x319
> +#define MT6360_PMU_CHG_CTRL10 0x31A
> +#define MT6360_PMU_DEVICE_TYPE 0x322
> +#define MT6360_PMU_USB_STATUS1 0x327
> +#define MT6360_PMU_CHG_STAT 0x34A
> +#define MT6360_PMU_CHG_CTRL19 0x361
> +#define MT6360_PMU_FOD_STAT 0x3E7
> +
> +/* MT6360_PMU_CHG_CTRL1 */
> +#define MT6360_FSLP_SHFT (3)
> +#define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHFT)
> +#define MT6360_OPA_MODE_SHFT (0)
> +#define MT6360_OPA_MODE_MASK BIT(MT6360_OPA_MODE_SHFT)
> +/* MT6360_PMU_CHG_CTRL2 */
> +#define MT6360_IINLMTSEL_SHFT (2)
> +#define MT6360_IINLMTSEL_MASK GENMASK(3, 2)
> +/* MT6360_PMU_CHG_CTRL3 */
> +#define MT6360_IAICR_SHFT (2)
> +#define MT6360_IAICR_MASK GENMASK(7, 2)
> +#define MT6360_ILIM_EN_MASK BIT(0)
> +/* MT6360_PMU_CHG_CTRL4 */
> +#define MT6360_VOREG_SHFT (1)
> +#define MT6360_VOREG_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL5 */
> +#define MT6360_VOBST_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL6 */
> +#define MT6360_VMIVR_SHFT (1)
> +#define MT6360_VMIVR_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL7 */
> +#define MT6360_ICHG_SHFT (2)
> +#define MT6360_ICHG_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL8 */
> +#define MT6360_IPREC_SHFT (0)
> +#define MT6360_IPREC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_CHG_CTRL9 */
> +#define MT6360_IEOC_SHFT (4)
> +#define MT6360_IEOC_MASK GENMASK(7, 4)
> +/* MT6360_PMU_CHG_CTRL10 */
> +#define MT6360_OTG_OC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_DEVICE_TYPE */
> +#define MT6360_USBCHGEN_MASK BIT(7)
> +/* MT6360_PMU_USB_STATUS1 */
> +#define MT6360_USB_STATUS_SHFT (4)
> +#define MT6360_USB_STATUS_MASK GENMASK(6, 4)
> +/* MT6360_PMU_CHG_STAT */
> +#define MT6360_CHG_STAT_SHFT (6)
> +#define MT6360_CHG_STAT_MASK GENMASK(7, 6)
> +#define MT6360_VBAT_LVL_MASK BIT(5)
> +/* MT6360_PMU_CHG_CTRL19 */
> +#define MT6360_VINOVP_SHFT (5)
> +#define MT6360_VINOVP_MASK GENMASK(6, 5)
> +/* MT6360_PMU_FOD_STAT */
> +#define MT6360_CHRDET_EXT_MASK BIT(4)
> +
> +/* uV */
> +#define MT6360_VMIVR_MIN 3900000
> +#define MT6360_VMIVR_MAX 13400000
> +#define MT6360_VMIVR_STEP 100000
> +/* 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_info {
> + struct device *dev;
> + struct regmap *regmap;
> + struct power_supply_desc psy_desc;
> + struct power_supply *psy;
> + struct regulator_dev *otg_rdev;
> + struct mutex chgdet_lock;
> + u32 vinovp;
> + bool pwr_rdy;
> + bool bc12_en;
> + int psy_usb_type;
> + struct work_struct chrdet_work;
> +};
> +
> +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_DISABLE_BC12,
> + 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,
> +};
> +
> +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0, max_sel;
> +
> + if (data >= min) {
> + target = (data - min) / step;
> + max_sel = (max - min) / step;
> + if (target > max_sel)
> + target = max_sel;
> + }
> + return target;
> +}
> +
> +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0;
> +
> + target = min + (sel * step);
> + if (target > max)
> + target = max;
> + return target;
> +}
> +
> +static 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_CHRDET_EXT_MASK) ? 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_CHG_STAT_MASK;
> + regval >>= MT6360_CHG_STAT_SHFT;
> + 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_CHG_STAT_MASK) >> MT6360_CHG_STAT_SHFT;
> + switch (chg_stat) {
> + case 0x01: /* Charge in Progress */
> + if (regval & MT6360_VBAT_LVL_MASK)
> + type = POWER_SUPPLY_CHARGE_TYPE_FAST;
> + else
> + type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> + break;
> + case 0x00: /* Not Charging */
> + case 0x02: /* Charge Done */
> + case 0x03: /* Charge Fault */
> + default:
> + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> + break;
> + }
> +
> + val->intval = type;
> + return 0;
> +}
> +
> +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + 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 ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return 0;
> +}
> +
> +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + 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_FSLP_MASK,
> + force_sleep << MT6360_FSLP_SHFT);
> +}
> +
> +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL7,
> + MT6360_ICHG_MASK,
> + sel << MT6360_ICHG_SHFT);
> +}
> +
> +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL4,
> + MT6360_VOREG_MASK,
> + sel << MT6360_VOREG_SHFT);
> +}
> +
> +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_IAICR_MASK,
> + sel << MT6360_IAICR_SHFT);
> +}
> +
> +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_VMIVR_MASK,
> + sel << MT6360_VMIVR_SHFT);
> +}
> +
> +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + MT6360_IPREC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL8,
> + MT6360_IPREC_MASK,
> + sel << MT6360_IPREC_SHFT);
> +}
> +
> +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + MT6360_IEOC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL9,
> + MT6360_IEOC_MASK,
> + sel << MT6360_IEOC_SHFT);
> +}
> +
> +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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_get_mivr(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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_set_mivr(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_INPUT_VOLTAGE_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_INPUT_VOLTAGE_LIMIT,
> + POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
> + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
> + POWER_SUPPLY_PROP_USB_TYPE,
> +};
> +
> +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,
> + .n_voltages = 57,
> + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> + .vsel_mask = MT6360_VOBST_MASK,
> + .enable_reg = MT6360_PMU_CHG_CTRL1,
> + .enable_mask = MT6360_OPA_MODE_MASK,
> +};
> +
> +static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
> +{
> + struct mt6360_chg_info *mci = data;
> + int ret;
> + unsigned int usb_status;
> + int last_usb_type;
> +
> + mutex_lock(&mci->chgdet_lock);
> + if (!mci->bc12_en) {
> + dev_warn(mci->dev, "Received attach interrupt, bc12 disabled, ignore irq\n");
> + 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_USB_STATUS_MASK;
> + usb_status >>= MT6360_USB_STATUS_SHFT;
> + switch (usb_status) {
> + case MT6360_CHG_TYPE_NOVBUS:
> + dev_dbg(mci->dev, "Received attach interrupt, no vbus\n");
> + goto out;
> + case MT6360_CHG_TYPE_UNDER_GOING:
> + dev_dbg(mci->dev, "Received attach interrupt, under going...\n");
> + goto out;
> + case MT6360_CHG_TYPE_SDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_SDPNSTD:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_CDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
> + break;
> + case MT6360_CHG_TYPE_DCP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
> + break;
> + case MT6360_CHG_TYPE_DISABLE_BC12:
> + dev_dbg(mci->dev, "Received attach interrupt, bc12 detect not enable\n");
> + goto out;
> + default:
> + dev_dbg(mci->dev, "Received attach interrupt, reserved address\n");
> + goto out;
> + }
> +
> + dev_dbg(mci->dev, "Received attach interrupt, chg_type = %d\n", mci->psy_usb_type);
> + 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 ret;
> + bool pwr_rdy;
> +
> + 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_dbg(mci->dev, "Received vbus interrupt, pwr_rdy is same(%d)\n", pwr_rdy);
> + goto out;
> + }
> + mci->pwr_rdy = pwr_rdy;
> + dev_dbg(mci->dev, "Received vbus interrupt, pwr_rdy = %d\n", pwr_rdy);
> + if (!pwr_rdy) {
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> + power_supply_changed(mci->psy);
> +
> + }
> + ret = regmap_update_bits(mci->regmap,
> + MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK,
> + pwr_rdy ? MT6360_USBCHGEN_MASK : 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);
> +
> + 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;
> +
> + mt6360_handle_chrdet_ext_evt(mci);
> + return IRQ_HANDLED;
> +}
> +
> +static int mt6360_chg_irq_register(struct platform_device *pdev)
> +{
> + const struct {
> + const char *name;
> + irq_handler_t handler;
> + } irq_descs[] = {
> + { "attach_i", mt6360_pmu_attach_i_handler },
> + { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler }
> + };
> + int i, ret;
> +
> + for (i = 0; i < ARRAY_SIZE(irq_descs); i++) {
> + ret = platform_get_irq_byname(pdev, irq_descs[i].name);
> + if (ret < 0)
> + return ret;
> +
> + ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
> + irq_descs[i].handler,
> + IRQF_TRIGGER_FALLING,
> + irq_descs[i].name,
> + platform_get_drvdata(pdev));
> + if (ret < 0)
> + return dev_err_probe(&pdev->dev, ret, "Failed to request %s irq\n",
> + irq_descs[i].name);
> + }
> +
> + return 0;
> +}
> +
> +struct mt6360_field_info {
> + struct device_attribute dev_attr;
> + u16 reg;
> + u8 mask;
> + u8 shft;
> +};
> +
> +static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
> +{
> + int ret;
> +
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret, "%s: Failed to disable bc12\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
> + MT6360_IINLMTSEL_MASK,
> + MT6360_IINLMTSEL_AICR <<
> + MT6360_IINLMTSEL_SHFT);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to switch iinlmtsel to aicr\n", __func__);
> + usleep_range(5000, 6000);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
> + MT6360_ILIM_EN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to disable ilim\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL10,
> + MT6360_OTG_OC_MASK, MT6360_OTG_OC_MASK);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to config otg oc to 3A\n", __func__);
> + return 0;
> +}
> +
> +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 int mt6360_parse_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + int ret;
> +
> + ret = device_property_read_u32(&pdev->dev, "richtek,vinovp-microvolt", &mci->vinovp);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse vinovp in DT\n");
> + return ret;
> +}
> +
> +static int mt6360_apply_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + u32 sel;
> +
> + sel = mt6360_vinovp_trans_to_sel(mci->vinovp);
> + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
> + MT6360_VINOVP_MASK, sel << MT6360_VINOVP_SHFT);
> +}
> +
> +static int mt6360_charger_probe(struct platform_device *pdev)
> +{
> + 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;
> +
> + ret = mt6360_parse_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse dt\n");
> +
> + mci->dev = &pdev->dev;
> + mci->vinovp = 6500000;
> + 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)
> + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to get parent regmap\n");
> +
> + ret = mt6360_apply_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to apply dt\n");
> +
> + 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;
> + mci->psy = devm_power_supply_register(&pdev->dev,
> + &mci->psy_desc, &charger_cfg);
> + if (IS_ERR(mci->psy))
> + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> + "Failed to register power supply dev\n");
> +
> + ret = mt6360_chg_init_setting(mci);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to initial setting\n");
> +
> + schedule_work(&mci->chrdet_work);
> +
> + ret = mt6360_chg_irq_register(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to register irqs\n");
> +
> + 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);
> +
> + 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",
> + .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("Gene Chen <[email protected]>");
> +MODULE_DESCRIPTION("MT6360 Charger Driver");
> +MODULE_LICENSE("GPL");
>
On Mon, 2021-01-18 at 20:41 +0800, Gene Chen wrote:
> From: Gene Chen <[email protected]>
>
> Add basic support for the battery charger for MT6360 PMIC
>
> Signed-off-by: Gene Chen <[email protected]>
> ---
> drivers/power/supply/Kconfig | 10 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/mt6360_charger.c | 914
> ++++++++++++++++++++++++++++++++++
> 3 files changed, 925 insertions(+)
> create mode 100644 drivers/power/supply/mt6360_charger.c
>
Thanks for the contribution :)
Few comments which I am not demanding to be 'fixed' - but which might
be good to be checked. Eg, please consider my comments as 'nit's.
...
> +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max,
> u32 step)
> +{
> + u32 target = 0, max_sel;
> +
> + if (data >= min) {
> + target = (data - min) / step;
> + max_sel = (max - min) / step;
> + if (target > max_sel)
> + target = max_sel;
> + }
> + return target;
> +}
lib/linear_ranges.c might already implement this ...
> +
> +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0;
> +
> + target = min + (sel * step);
> + if (target > max)
> + target = max;
> + return target;
> +}
...and this.
> +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
linear_ranges?
> + 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 ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
linear_ranges?
> + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
linear_ranges?
> + return 0;
> +}
> +
> +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_STEP);
linear_ranges?
> + 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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + MT6360_IPREC_STEP);
linear_ranges?
> + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + MT6360_IEOC_STEP);
linear_ranges?
> + 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_FSLP_MASK,
> + force_sleep << MT6360_FSLP_SHFT);
> +}
> +
> +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> + const union power_supply_propval
> *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL7,
> + MT6360_ICHG_MASK,
> + sel << MT6360_ICHG_SHFT);
> +}
> +
> +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL4,
> + MT6360_VOREG_MASK,
> + sel << MT6360_VOREG_SHFT);
> +}
> +
> +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> + const union power_supply_propval
> *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_IAICR_MASK,
> + sel << MT6360_IAICR_SHFT);
> +}
> +
> +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> + const union power_supply_propval
> *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_VMIVR_MASK,
> + sel << MT6360_VMIVR_SHFT);
> +}
> +
> +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> + const union power_supply_propval
> *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + MT6360_IPREC_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL8,
> + MT6360_IPREC_MASK,
> + sel << MT6360_IPREC_SHFT);
> +}
> +
> +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> + const union power_supply_propval
> *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + MT6360_IEOC_STEP);
linear_ranges?
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL9,
> + MT6360_IEOC_MASK,
> + sel << MT6360_IEOC_SHFT);
> +}
> +
> +
> +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,
> + .n_voltages = 57,
> + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> + .vsel_mask = MT6360_VOBST_MASK,
> + .enable_reg = MT6360_PMU_CHG_CTRL1,
> + .enable_mask = MT6360_OPA_MODE_MASK,
> +};
Any particular reason why these are here and not in a regulator driver?
...
> +static int mt6360_charger_probe(struct platform_device *pdev)
> +{
> + 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;
> +
> + ret = mt6360_parse_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse
> dt\n");
> +
> + mci->dev = &pdev->dev;
> + mci->vinovp = 6500000;
> + 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)
> + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to
> get parent regmap\n");
> +
> + ret = mt6360_apply_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to apply
> dt\n");
> +
> + 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;
> + mci->psy = devm_power_supply_register(&pdev->dev,
> + &mci->psy_desc,
> &charger_cfg);
> + if (IS_ERR(mci->psy))
> + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> + "Failed to register power supply
> dev\n");
> +
> + ret = mt6360_chg_init_setting(mci);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to
> initial setting\n");
> +
> + schedule_work(&mci->chrdet_work);
Is this work scheduled anywhere else? If not - why doing this in wq
context? If yes - does this wq need cancellation upon exit?
> +
> + ret = mt6360_chg_irq_register(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to
> register irqs\n");
> +
> + 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);
> +
> + return 0;
> +}
> +
Best Regards
Matti Vaittinen
Hi,
On Mon, Jan 18, 2021 at 08:41:43PM +0800, Gene Chen wrote:
> From: Gene Chen <[email protected]>
>
> Add basic support for the battery charger for MT6360 PMIC
>
> Signed-off-by: Gene Chen <[email protected]>
> ---
> drivers/power/supply/Kconfig | 10 +
> drivers/power/supply/Makefile | 1 +
> drivers/power/supply/mt6360_charger.c | 914 ++++++++++++++++++++++++++++++++++
> 3 files changed, 925 insertions(+)
> create mode 100644 drivers/power/supply/mt6360_charger.c
>
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index eec646c..dd63bed 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -567,6 +567,16 @@ 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
> + depends on REGULATOR
> + help
> + Say Y here to enable MT6360 Charger Part.
> + The device supports High-Accuracy Voltage/Current Regulation,
> + 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 dd4b863..9bd0804 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..d80bdad
> --- /dev/null
> +++ b/drivers/power/supply/mt6360_charger.c
> @@ -0,0 +1,914 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2021 MediaTek Inc.
> + */
> +
> +#include <linux/init.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/power_supply.h>
> +#include <linux/property.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/driver.h>
> +
> +#define MT6360_PMU_CHG_CTRL1 0x311
> +#define MT6360_PMU_CHG_CTRL2 0x312
> +#define MT6360_PMU_CHG_CTRL3 0x313
> +#define MT6360_PMU_CHG_CTRL4 0x314
> +#define MT6360_PMU_CHG_CTRL5 0x315
> +#define MT6360_PMU_CHG_CTRL6 0x316
> +#define MT6360_PMU_CHG_CTRL7 0x317
> +#define MT6360_PMU_CHG_CTRL8 0x318
> +#define MT6360_PMU_CHG_CTRL9 0x319
> +#define MT6360_PMU_CHG_CTRL10 0x31A
> +#define MT6360_PMU_DEVICE_TYPE 0x322
> +#define MT6360_PMU_USB_STATUS1 0x327
> +#define MT6360_PMU_CHG_STAT 0x34A
> +#define MT6360_PMU_CHG_CTRL19 0x361
> +#define MT6360_PMU_FOD_STAT 0x3E7
> +
> +/* MT6360_PMU_CHG_CTRL1 */
> +#define MT6360_FSLP_SHFT (3)
> +#define MT6360_FSLP_MASK BIT(MT6360_FSLP_SHFT)
> +#define MT6360_OPA_MODE_SHFT (0)
> +#define MT6360_OPA_MODE_MASK BIT(MT6360_OPA_MODE_SHFT)
> +/* MT6360_PMU_CHG_CTRL2 */
> +#define MT6360_IINLMTSEL_SHFT (2)
> +#define MT6360_IINLMTSEL_MASK GENMASK(3, 2)
> +/* MT6360_PMU_CHG_CTRL3 */
> +#define MT6360_IAICR_SHFT (2)
> +#define MT6360_IAICR_MASK GENMASK(7, 2)
> +#define MT6360_ILIM_EN_MASK BIT(0)
> +/* MT6360_PMU_CHG_CTRL4 */
> +#define MT6360_VOREG_SHFT (1)
> +#define MT6360_VOREG_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL5 */
> +#define MT6360_VOBST_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL6 */
> +#define MT6360_VMIVR_SHFT (1)
> +#define MT6360_VMIVR_MASK GENMASK(7, 1)
> +/* MT6360_PMU_CHG_CTRL7 */
> +#define MT6360_ICHG_SHFT (2)
> +#define MT6360_ICHG_MASK GENMASK(7, 2)
> +/* MT6360_PMU_CHG_CTRL8 */
> +#define MT6360_IPREC_SHFT (0)
> +#define MT6360_IPREC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_CHG_CTRL9 */
> +#define MT6360_IEOC_SHFT (4)
> +#define MT6360_IEOC_MASK GENMASK(7, 4)
> +/* MT6360_PMU_CHG_CTRL10 */
> +#define MT6360_OTG_OC_MASK GENMASK(3, 0)
> +/* MT6360_PMU_DEVICE_TYPE */
> +#define MT6360_USBCHGEN_MASK BIT(7)
> +/* MT6360_PMU_USB_STATUS1 */
> +#define MT6360_USB_STATUS_SHFT (4)
> +#define MT6360_USB_STATUS_MASK GENMASK(6, 4)
> +/* MT6360_PMU_CHG_STAT */
> +#define MT6360_CHG_STAT_SHFT (6)
> +#define MT6360_CHG_STAT_MASK GENMASK(7, 6)
> +#define MT6360_VBAT_LVL_MASK BIT(5)
> +/* MT6360_PMU_CHG_CTRL19 */
> +#define MT6360_VINOVP_SHFT (5)
> +#define MT6360_VINOVP_MASK GENMASK(6, 5)
> +/* MT6360_PMU_FOD_STAT */
> +#define MT6360_CHRDET_EXT_MASK BIT(4)
> +
> +/* uV */
> +#define MT6360_VMIVR_MIN 3900000
> +#define MT6360_VMIVR_MAX 13400000
> +#define MT6360_VMIVR_STEP 100000
> +/* 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_info {
> + struct device *dev;
> + struct regmap *regmap;
> + struct power_supply_desc psy_desc;
> + struct power_supply *psy;
> + struct regulator_dev *otg_rdev;
> + struct mutex chgdet_lock;
> + u32 vinovp;
> + bool pwr_rdy;
> + bool bc12_en;
> + int psy_usb_type;
> + struct work_struct chrdet_work;
> +};
> +
> +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_DISABLE_BC12,
> + 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,
> +};
> +
> +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0, max_sel;
> +
> + if (data >= min) {
> + target = (data - min) / step;
> + max_sel = (max - min) / step;
> + if (target > max_sel)
> + target = max_sel;
> + }
> + return target;
> +}
> +
> +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> +{
> + u32 target = 0;
> +
> + target = min + (sel * step);
> + if (target > max)
> + target = max;
> + return target;
> +}
> +
> +static 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_CHRDET_EXT_MASK) ? 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_CHG_STAT_MASK;
> + regval >>= MT6360_CHG_STAT_SHFT;
> + 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_CHG_STAT_MASK) >> MT6360_CHG_STAT_SHFT;
> + switch (chg_stat) {
> + case 0x01: /* Charge in Progress */
> + if (regval & MT6360_VBAT_LVL_MASK)
> + type = POWER_SUPPLY_CHARGE_TYPE_FAST;
> + else
> + type = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
> + break;
> + case 0x00: /* Not Charging */
> + case 0x02: /* Charge Done */
> + case 0x03: /* Charge Fault */
> + default:
> + type = POWER_SUPPLY_CHARGE_TYPE_NONE;
> + break;
> + }
> +
> + val->intval = type;
> + return 0;
> +}
> +
> +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + 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 ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return 0;
> +}
> +
> +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> + union power_supply_propval *val)
> +{
> + int ret;
> + unsigned int regval;
> +
> + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> + if (ret < 0)
> + return ret;
> + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> + val->intval = mt6360_map_real_val(regval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + 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_FSLP_MASK,
> + force_sleep << MT6360_FSLP_SHFT);
> +}
> +
> +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_ICHG_MIN,
> + MT6360_ICHG_MAX,
> + MT6360_ICHG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL7,
> + MT6360_ICHG_MASK,
> + sel << MT6360_ICHG_SHFT);
> +}
> +
> +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VOREG_MIN,
> + MT6360_VOREG_MAX,
> + MT6360_VOREG_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL4,
> + MT6360_VOREG_MASK,
> + sel << MT6360_VOREG_SHFT);
> +}
> +
> +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_AICR_MIN,
> + MT6360_AICR_MAX,
> + MT6360_AICR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_IAICR_MASK,
> + sel << MT6360_IAICR_SHFT);
> +}
> +
> +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_VMIVR_MIN,
> + MT6360_VMIVR_MAX,
> + MT6360_VMIVR_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL3,
> + MT6360_VMIVR_MASK,
> + sel << MT6360_VMIVR_SHFT);
> +}
> +
> +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IPREC_MIN,
> + MT6360_IPREC_MAX,
> + MT6360_IPREC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL8,
> + MT6360_IPREC_MASK,
> + sel << MT6360_IPREC_SHFT);
> +}
> +
> +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> + const union power_supply_propval *val)
> +{
> + u8 sel;
> +
> + sel = mt6360_map_reg_sel(val->intval,
> + MT6360_IEOC_MIN,
> + MT6360_IEOC_MAX,
> + MT6360_IEOC_STEP);
> + return regmap_update_bits(mci->regmap,
> + MT6360_PMU_CHG_CTRL9,
> + MT6360_IEOC_MASK,
> + sel << MT6360_IEOC_SHFT);
> +}
> +
> +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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_get_mivr(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;
> +
> + 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_INPUT_VOLTAGE_LIMIT:
> + ret = mt6360_charger_set_mivr(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_INPUT_VOLTAGE_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_INPUT_VOLTAGE_LIMIT,
> + POWER_SUPPLY_PROP_PRECHARGE_CURRENT,
> + POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,
> + POWER_SUPPLY_PROP_USB_TYPE,
> +};
> +
> +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,
> + .n_voltages = 57,
> + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> + .vsel_mask = MT6360_VOBST_MASK,
> + .enable_reg = MT6360_PMU_CHG_CTRL1,
> + .enable_mask = MT6360_OPA_MODE_MASK,
> +};
> +
> +static irqreturn_t mt6360_pmu_attach_i_handler(int irq, void *data)
> +{
> + struct mt6360_chg_info *mci = data;
> + int ret;
> + unsigned int usb_status;
> + int last_usb_type;
> +
> + mutex_lock(&mci->chgdet_lock);
> + if (!mci->bc12_en) {
> + dev_warn(mci->dev, "Received attach interrupt, bc12 disabled, ignore irq\n");
> + 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_USB_STATUS_MASK;
> + usb_status >>= MT6360_USB_STATUS_SHFT;
> + switch (usb_status) {
> + case MT6360_CHG_TYPE_NOVBUS:
> + dev_dbg(mci->dev, "Received attach interrupt, no vbus\n");
> + goto out;
> + case MT6360_CHG_TYPE_UNDER_GOING:
> + dev_dbg(mci->dev, "Received attach interrupt, under going...\n");
> + goto out;
> + case MT6360_CHG_TYPE_SDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_SDPNSTD:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP;
> + break;
> + case MT6360_CHG_TYPE_CDP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_CDP;
> + break;
> + case MT6360_CHG_TYPE_DCP:
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_DCP;
> + break;
> + case MT6360_CHG_TYPE_DISABLE_BC12:
> + dev_dbg(mci->dev, "Received attach interrupt, bc12 detect not enable\n");
> + goto out;
> + default:
> + dev_dbg(mci->dev, "Received attach interrupt, reserved address\n");
> + goto out;
> + }
I suppose the cases with dev_dbg should have
mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> + dev_dbg(mci->dev, "Received attach interrupt, chg_type = %d\n", mci->psy_usb_type);
> + 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 ret;
> + bool pwr_rdy;
> +
> + 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_dbg(mci->dev, "Received vbus interrupt, pwr_rdy is same(%d)\n", pwr_rdy);
> + goto out;
> + }
> + mci->pwr_rdy = pwr_rdy;
> + dev_dbg(mci->dev, "Received vbus interrupt, pwr_rdy = %d\n", pwr_rdy);
> + if (!pwr_rdy) {
> + mci->psy_usb_type = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> + power_supply_changed(mci->psy);
> +
> + }
> + ret = regmap_update_bits(mci->regmap,
> + MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK,
> + pwr_rdy ? MT6360_USBCHGEN_MASK : 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);
> +
> + 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;
> +
> + mt6360_handle_chrdet_ext_evt(mci);
> + return IRQ_HANDLED;
> +}
> +
> +static int mt6360_chg_irq_register(struct platform_device *pdev)
> +{
> + const struct {
> + const char *name;
> + irq_handler_t handler;
> + } irq_descs[] = {
> + { "attach_i", mt6360_pmu_attach_i_handler },
> + { "chrdet_ext_evt", mt6360_pmu_chrdet_ext_evt_handler }
> + };
> + int i, ret;
> +
> + for (i = 0; i < ARRAY_SIZE(irq_descs); i++) {
> + ret = platform_get_irq_byname(pdev, irq_descs[i].name);
> + if (ret < 0)
> + return ret;
> +
> + ret = devm_request_threaded_irq(&pdev->dev, ret, NULL,
> + irq_descs[i].handler,
> + IRQF_TRIGGER_FALLING,
> + irq_descs[i].name,
> + platform_get_drvdata(pdev));
> + if (ret < 0)
> + return dev_err_probe(&pdev->dev, ret, "Failed to request %s irq\n",
> + irq_descs[i].name);
Missing IRQF_ONESHOT
> + }
> +
> + return 0;
> +}
> +
> +struct mt6360_field_info {
> + struct device_attribute dev_attr;
> + u16 reg;
> + u8 mask;
> + u8 shft;
> +};
> +
> +static int mt6360_chg_init_setting(struct mt6360_chg_info *mci)
> +{
> + int ret;
> +
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_DEVICE_TYPE,
> + MT6360_USBCHGEN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret, "%s: Failed to disable bc12\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL2,
> + MT6360_IINLMTSEL_MASK,
> + MT6360_IINLMTSEL_AICR <<
> + MT6360_IINLMTSEL_SHFT);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to switch iinlmtsel to aicr\n", __func__);
> + usleep_range(5000, 6000);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL3,
> + MT6360_ILIM_EN_MASK, 0);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to disable ilim\n", __func__);
> + ret = regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL10,
> + MT6360_OTG_OC_MASK, MT6360_OTG_OC_MASK);
> + if (ret)
> + return dev_err_probe(mci->dev, ret,
> + "%s: Failed to config otg oc to 3A\n", __func__);
> + return 0;
> +}
> +
> +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 int mt6360_parse_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + int ret;
> +
> + ret = device_property_read_u32(&pdev->dev, "richtek,vinovp-microvolt", &mci->vinovp);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse vinovp in DT\n");
> + return ret;
> +}
> +
> +static int mt6360_apply_dt(struct platform_device *pdev)
> +{
> + struct mt6360_chg_info *mci = dev_get_drvdata(&pdev->dev);
> + u32 sel;
> +
> + sel = mt6360_vinovp_trans_to_sel(mci->vinovp);
> + return regmap_update_bits(mci->regmap, MT6360_PMU_CHG_CTRL19,
> + MT6360_VINOVP_MASK, sel << MT6360_VINOVP_SHFT);
> +}
> +
> +static int mt6360_charger_probe(struct platform_device *pdev)
> +{
> + 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;
> +
> + ret = mt6360_parse_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to parse dt\n");
Just directly call device_property_read_u32() here. No need for
extra complexity.
> + mci->dev = &pdev->dev;
> + mci->vinovp = 6500000;
You are overwriting the value provided by device_property_* here.
You need to call it after initializing the value.
> + 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)
> + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to get parent regmap\n");
> +
> + ret = mt6360_apply_dt(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to apply dt\n");
Either rename to something like mt6360_apply_config
(device_property_* also supports e.g. ACPI), or just
drop the function and do the config here. Is there
any reason to initialize this value early? Otherwise
just merge this function into mt6360_chg_init_setting().
> + 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;
> + mci->psy = devm_power_supply_register(&pdev->dev,
> + &mci->psy_desc, &charger_cfg);
> + if (IS_ERR(mci->psy))
> + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> + "Failed to register power supply dev\n");
> +
> + ret = mt6360_chg_init_setting(mci);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to initial setting\n");
> +
> + schedule_work(&mci->chrdet_work);
Missing work cleanup on probe error or driver removal?
> + ret = mt6360_chg_irq_register(pdev);
> + if (ret)
> + return dev_err_probe(&pdev->dev, ret, "Failed to register irqs\n");
> +
> + 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);
> +
> + 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",
> + .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("Gene Chen <[email protected]>");
> +MODULE_DESCRIPTION("MT6360 Charger Driver");
> +MODULE_LICENSE("GPL");
-- Sebastian
Matti Vaittinen <[email protected]> 於 2021年3月30日 週二 下午7:48寫道：
>
>
> On Mon, 2021-01-18 at 20:41 +0800, Gene Chen wrote:
> > From: Gene Chen <[email protected]>
> >
> > Add basic support for the battery charger for MT6360 PMIC
> >
> > Signed-off-by: Gene Chen <[email protected]>
> > ---
> > drivers/power/supply/Kconfig | 10 +
> > drivers/power/supply/Makefile | 1 +
> > drivers/power/supply/mt6360_charger.c | 914
> > ++++++++++++++++++++++++++++++++++
> > 3 files changed, 925 insertions(+)
> > create mode 100644 drivers/power/supply/mt6360_charger.c
> >
>
> Thanks for the contribution :)
>
> Few comments which I am not demanding to be 'fixed' - but which might
> be good to be checked. Eg, please consider my comments as 'nit's.
>
> ...
>
> > +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32 max,
> > u32 step)
> > +{
> > + u32 target = 0, max_sel;
> > +
> > + if (data >= min) {
> > + target = (data - min) / step;
> > + max_sel = (max - min) / step;
> > + if (target > max_sel)
> > + target = max_sel;
> > + }
> > + return target;
> > +}
>
> lib/linear_ranges.c might already implement this ...
>
I found we are neither linear_range_get_selector_high or
linear_range_get_selector_low.
When value lower than min_value, choose min_sel. If higher than
max_value, choose max_sel.
Should I create linear_range_get_selector() for this?
> > +
> > +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32 step)
> > +{
> > + u32 target = 0;
> > +
> > + target = min + (sel * step);
> > + if (target > max)
> > + target = max;
> > + return target;
> > +}
>
> ...and this.
>
ACK, We can use "linear_range_get_value", but maybe wait for reply
about "mt6360_map_reg_sel"
> > +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_ICHG_MIN,
> > + MT6360_ICHG_MAX,
> > + MT6360_ICHG_STEP);
>
> linear_ranges?
>
> > + 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 ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_VOREG_MIN,
> > + MT6360_VOREG_MAX,
> > + MT6360_VOREG_STEP);
>
> linear_ranges?
>
> > + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_AICR_MIN,
> > + MT6360_AICR_MAX,
> > + MT6360_AICR_STEP);
>
> linear_ranges?
>
> > + return 0;
> > +}
> > +
> > +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> > + union power_supply_propval *val)
> > +{
> > + int ret;
> > + unsigned int regval;
> > +
> > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6, ®val);
> > + if (ret < 0)
> > + return ret;
> > + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_VMIVR_MIN,
> > + MT6360_VMIVR_MAX,
> > + MT6360_VMIVR_STEP);
>
> linear_ranges?
>
> > + 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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_IPREC_MIN,
> > + MT6360_IPREC_MAX,
> > + MT6360_IPREC_STEP);
>
> linear_ranges?
>
> > + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> > + val->intval = mt6360_map_real_val(regval,
> > + MT6360_IEOC_MIN,
> > + MT6360_IEOC_MAX,
> > + MT6360_IEOC_STEP);
>
> linear_ranges?
>
> > + 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_FSLP_MASK,
> > + force_sleep << MT6360_FSLP_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval
> > *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_ICHG_MIN,
> > + MT6360_ICHG_MAX,
> > + MT6360_ICHG_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL7,
> > + MT6360_ICHG_MASK,
> > + sel << MT6360_ICHG_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> > + const union power_supply_propval *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_VOREG_MIN,
> > + MT6360_VOREG_MAX,
> > + MT6360_VOREG_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL4,
> > + MT6360_VOREG_MASK,
> > + sel << MT6360_VOREG_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> > + const union power_supply_propval
> > *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_AICR_MIN,
> > + MT6360_AICR_MAX,
> > + MT6360_AICR_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL3,
> > + MT6360_IAICR_MASK,
> > + sel << MT6360_IAICR_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> > + const union power_supply_propval
> > *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_VMIVR_MIN,
> > + MT6360_VMIVR_MAX,
> > + MT6360_VMIVR_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL3,
> > + MT6360_VMIVR_MASK,
> > + sel << MT6360_VMIVR_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_iprechg(struct mt6360_chg_info *mci,
> > + const union power_supply_propval
> > *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_IPREC_MIN,
> > + MT6360_IPREC_MAX,
> > + MT6360_IPREC_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL8,
> > + MT6360_IPREC_MASK,
> > + sel << MT6360_IPREC_SHFT);
> > +}
> > +
> > +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> > + const union power_supply_propval
> > *val)
> > +{
> > + u8 sel;
> > +
> > + sel = mt6360_map_reg_sel(val->intval,
> > + MT6360_IEOC_MIN,
> > + MT6360_IEOC_MAX,
> > + MT6360_IEOC_STEP);
>
> linear_ranges?
>
> > + return regmap_update_bits(mci->regmap,
> > + MT6360_PMU_CHG_CTRL9,
> > + MT6360_IEOC_MASK,
> > + sel << MT6360_IEOC_SHFT);
> > +}
> > +
> > +
>
>
>
> > +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,
> > + .n_voltages = 57,
> > + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> > + .vsel_mask = MT6360_VOBST_MASK,
> > + .enable_reg = MT6360_PMU_CHG_CTRL1,
> > + .enable_mask = MT6360_OPA_MODE_MASK,
> > +};
>
> Any particular reason why these are here and not in a regulator driver?
>
MT6360 charger is a switching charger which can charging or boost OTG VBUS.
> ...
>
> > +static int mt6360_charger_probe(struct platform_device *pdev)
> > +{
> > + 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;
> > +
> > + ret = mt6360_parse_dt(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to parse
> > dt\n");
> > +
> > + mci->dev = &pdev->dev;
> > + mci->vinovp = 6500000;
> > + 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)
> > + return dev_err_probe(&pdev->dev, -ENODEV, "Failed to
> > get parent regmap\n");
> > +
> > + ret = mt6360_apply_dt(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to apply
> > dt\n");
> > +
> > + 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;
> > + mci->psy = devm_power_supply_register(&pdev->dev,
> > + &mci->psy_desc,
> > &charger_cfg);
> > + if (IS_ERR(mci->psy))
> > + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> > + "Failed to register power supply
> > dev\n");
> > +
> > + ret = mt6360_chg_init_setting(mci);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > initial setting\n");
> > +
> > + schedule_work(&mci->chrdet_work);
>
> Is this work scheduled anywhere else? If not - why doing this in wq
> context? If yes - does this wq need cancellation upon exit?
>
MT6360 MFD driver probe will clear all interrupts then add charger device.
We need to schedule work for handling boot-up vbus is always exist,
because irq is already cleared.
> > +
> > + ret = mt6360_chg_irq_register(pdev);
> > + if (ret)
> > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > register irqs\n");
> > +
> > + 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);
> > +
> > + return 0;
> > +}
> > +
>
> Best Regards
> Matti Vaittinen
>
On Wed, 2021-05-26 at 17:40 +0800, Gene Chen wrote:
> Matti Vaittinen <[email protected]> 於 2021年3月30日 週二
> 下午7:48寫道：
> >
> > On Mon, 2021-01-18 at 20:41 +0800, Gene Chen wrote:
> > > From: Gene Chen <[email protected]>
> > >
> > > Add basic support for the battery charger for MT6360 PMIC
> > >
> > > Signed-off-by: Gene Chen <[email protected]>
> > > ---
> > > drivers/power/supply/Kconfig | 10 +
> > > drivers/power/supply/Makefile | 1 +
> > > drivers/power/supply/mt6360_charger.c | 914
> > > ++++++++++++++++++++++++++++++++++
> > > 3 files changed, 925 insertions(+)
> > > create mode 100644 drivers/power/supply/mt6360_charger.c
> > >
> >
> > Thanks for the contribution :)
> >
> > Few comments which I am not demanding to be 'fixed' - but which
> > might
> > be good to be checked. Eg, please consider my comments as 'nit's.
> >
> > ...
> >
> > > +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32
> > > max,
> > > u32 step)
> > > +{
> > > + u32 target = 0, max_sel;
> > > +
> > > + if (data >= min) {
> > > + target = (data - min) / step;
> > > + max_sel = (max - min) / step;
> > > + if (target > max_sel)
> > > + target = max_sel;
> > > + }
> > > + return target;
> > > +}
> >
> > lib/linear_ranges.c might already implement this ...
> >
>
> I found we are neither linear_range_get_selector_high or
> linear_range_get_selector_low.
> When value lower than min_value, choose min_sel. If higher than
> max_value, choose max_sel.
Ah, correct.
> Should I create linear_range_get_selector() for this?
My suggestion would be yes, but I am not insisting on it.
>
> > > +
> > > +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32
> > > step)
> > > +{
> > > + u32 target = 0;
> > > +
> > > + target = min + (sel * step);
> > > + if (target > max)
> > > + target = max;
> > > + return target;
> > > +}
> >
> > ...and this.
> >
>
> ACK, We can use "linear_range_get_value", but maybe wait for reply
> about "mt6360_map_reg_sel"
>
> > > +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> > > + union power_supply_propval *val)
> > > +{
> > > + int ret;
> > > + unsigned int regval;
> > > +
> > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7,
> > > ®val);
> > > + if (ret < 0)
> > > + return ret;
> > > + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_ICHG_MIN,
> > > + MT6360_ICHG_MAX,
> > > + MT6360_ICHG_STEP);
> >
> > linear_ranges?
> >
> > > + 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 ret;
> > > + unsigned int regval;
> > > +
> > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4,
> > > ®val);
> > > + if (ret < 0)
> > > + return ret;
> > > + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_VOREG_MIN,
> > > + MT6360_VOREG_MAX,
> > > + MT6360_VOREG_STEP);
> >
> > linear_ranges?
> >
> > > + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_AICR_MIN,
> > > + MT6360_AICR_MAX,
> > > + MT6360_AICR_STEP);
> >
> > linear_ranges?
> >
> > > + return 0;
> > > +}
> > > +
> > > +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> > > + union power_supply_propval *val)
> > > +{
> > > + int ret;
> > > + unsigned int regval;
> > > +
> > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6,
> > > ®val);
> > > + if (ret < 0)
> > > + return ret;
> > > + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_VMIVR_MIN,
> > > + MT6360_VMIVR_MAX,
> > > + MT6360_VMIVR_STEP);
> >
> > linear_ranges?
> >
> > > + 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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_IPREC_MIN,
> > > + MT6360_IPREC_MAX,
> > > + MT6360_IPREC_STEP);
> >
> > linear_ranges?
> >
> > > + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> > > + val->intval = mt6360_map_real_val(regval,
> > > + MT6360_IEOC_MIN,
> > > + MT6360_IEOC_MAX,
> > > + MT6360_IEOC_STEP);
> >
> > linear_ranges?
> >
> > > + 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_FSLP_MASK,
> > > + force_sleep << MT6360_FSLP_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> > > + const union power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_ICHG_MIN,
> > > + MT6360_ICHG_MAX,
> > > + MT6360_ICHG_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL7,
> > > + MT6360_ICHG_MASK,
> > > + sel << MT6360_ICHG_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> > > + const union power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_VOREG_MIN,
> > > + MT6360_VOREG_MAX,
> > > + MT6360_VOREG_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL4,
> > > + MT6360_VOREG_MASK,
> > > + sel << MT6360_VOREG_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> > > + const union power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_AICR_MIN,
> > > + MT6360_AICR_MAX,
> > > + MT6360_AICR_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL3,
> > > + MT6360_IAICR_MASK,
> > > + sel << MT6360_IAICR_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> > > + const union power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_VMIVR_MIN,
> > > + MT6360_VMIVR_MAX,
> > > + MT6360_VMIVR_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL3,
> > > + MT6360_VMIVR_MASK,
> > > + sel << MT6360_VMIVR_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_iprechg(struct mt6360_chg_info
> > > *mci,
> > > + const union
> > > power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_IPREC_MIN,
> > > + MT6360_IPREC_MAX,
> > > + MT6360_IPREC_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL8,
> > > + MT6360_IPREC_MASK,
> > > + sel << MT6360_IPREC_SHFT);
> > > +}
> > > +
> > > +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> > > + const union power_supply_propval
> > > *val)
> > > +{
> > > + u8 sel;
> > > +
> > > + sel = mt6360_map_reg_sel(val->intval,
> > > + MT6360_IEOC_MIN,
> > > + MT6360_IEOC_MAX,
> > > + MT6360_IEOC_STEP);
> >
> > linear_ranges?
> >
> > > + return regmap_update_bits(mci->regmap,
> > > + MT6360_PMU_CHG_CTRL9,
> > > + MT6360_IEOC_MASK,
> > > + sel << MT6360_IEOC_SHFT);
> > > +}
> > > +
> > > +
> >
> >
> > > +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,
> > > + .n_voltages = 57,
> > > + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> > > + .vsel_mask = MT6360_VOBST_MASK,
> > > + .enable_reg = MT6360_PMU_CHG_CTRL1,
> > > + .enable_mask = MT6360_OPA_MODE_MASK,
> > > +};
> >
> > Any particular reason why these are here and not in a regulator
> > driver?
> >
>
> MT6360 charger is a switching charger which can charging or boost OTG
> VBUS.
>
I see. It was just strange for me to see the regulators being set-up in
the charger driver. I would have expected to see separate regulator
driver for this, I guess this is MFD in any case, right? So I would
have expected seeing a sub-device for regulators.
I however see we have couple of other charger drivers here doing the
same thing (setting up regulators in charger driver) - so if this is
normal then I for sure have no objections :)
> > ...
> >
> > > +static int mt6360_charger_probe(struct platform_device *pdev)
> > > +{
> > > + 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;
> > > +
> > > + ret = mt6360_parse_dt(pdev);
> > > + if (ret)
> > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > parse
> > > dt\n");
> > > +
> > > + mci->dev = &pdev->dev;
> > > + mci->vinovp = 6500000;
> > > + 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)
> > > + return dev_err_probe(&pdev->dev, -ENODEV, "Failed
> > > to
> > > get parent regmap\n");
> > > +
> > > + ret = mt6360_apply_dt(pdev);
> > > + if (ret)
> > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > apply
> > > dt\n");
> > > +
> > > + 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;
> > > + mci->psy = devm_power_supply_register(&pdev->dev,
> > > + &mci->psy_desc,
> > > &charger_cfg);
> > > + if (IS_ERR(mci->psy))
> > > + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> > > + "Failed to register power
> > > supply
> > > dev\n");
> > > +
> > > + ret = mt6360_chg_init_setting(mci);
> > > + if (ret)
> > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > initial setting\n");
> > > +
> > > + schedule_work(&mci->chrdet_work);
> >
> > Is this work scheduled anywhere else? If not - why doing this in wq
> > context? If yes - does this wq need cancellation upon exit?
> >
>
> MT6360 MFD driver probe will clear all interrupts then add charger
> device.
> We need to schedule work for handling boot-up vbus is always exist,
> because irq is already cleared.
>
Thank you for the explanation. I was just wondering why not checking
charger status right here? I didn't understand why the checking was
pushed to a WQ. You probably have a valid reason. I assume it's just me
who is not understanding this :) Additionally I was wondering what
happens if for example the IRQ registration below fails and we detach
the driver - I don't see work-queue being flushed. Thanks for all the
explanations!
> > > +
> > > + ret = mt6360_chg_irq_register(pdev);
> > > + if (ret)
> > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > register irqs\n");
> > > +
> > > + 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);
> > > +
> > > + return 0;
> > > +}
> > > +
Matti Vaittinen <[email protected]> 於 2021年5月27日 週四 下午12:25寫道：
>
>
> On Wed, 2021-05-26 at 17:40 +0800, Gene Chen wrote:
> > Matti Vaittinen <[email protected]> 於 2021年3月30日 週二
> > 下午7:48寫道：
> > >
> > > On Mon, 2021-01-18 at 20:41 +0800, Gene Chen wrote:
> > > > From: Gene Chen <[email protected]>
> > > >
> > > > Add basic support for the battery charger for MT6360 PMIC
> > > >
> > > > Signed-off-by: Gene Chen <[email protected]>
> > > > ---
> > > > drivers/power/supply/Kconfig | 10 +
> > > > drivers/power/supply/Makefile | 1 +
> > > > drivers/power/supply/mt6360_charger.c | 914
> > > > ++++++++++++++++++++++++++++++++++
> > > > 3 files changed, 925 insertions(+)
> > > > create mode 100644 drivers/power/supply/mt6360_charger.c
> > > >
> > >
> > > Thanks for the contribution :)
> > >
> > > Few comments which I am not demanding to be 'fixed' - but which
> > > might
> > > be good to be checked. Eg, please consider my comments as 'nit's.
> > >
> > > ...
> > >
> > > > +static unsigned int mt6360_map_reg_sel(u32 data, u32 min, u32
> > > > max,
> > > > u32 step)
> > > > +{
> > > > + u32 target = 0, max_sel;
> > > > +
> > > > + if (data >= min) {
> > > > + target = (data - min) / step;
> > > > + max_sel = (max - min) / step;
> > > > + if (target > max_sel)
> > > > + target = max_sel;
> > > > + }
> > > > + return target;
> > > > +}
> > >
> > > lib/linear_ranges.c might already implement this ...
> > >
> >
> > I found we are neither linear_range_get_selector_high or
> > linear_range_get_selector_low.
> > When value lower than min_value, choose min_sel. If higher than
> > max_value, choose max_sel.
>
> Ah, correct.
>
> > Should I create linear_range_get_selector() for this?
>
> My suggestion would be yes, but I am not insisting on it.
>
Maybe this is a special choosing mechanism, I will keep it.
Could I also keep mt6360_map_real_val?
> >
> > > > +
> > > > +static u32 mt6360_map_real_val(u32 sel, u32 min, u32 max, u32
> > > > step)
> > > > +{
> > > > + u32 target = 0;
> > > > +
> > > > + target = min + (sel * step);
> > > > + if (target > max)
> > > > + target = max;
> > > > + return target;
> > > > +}
> > >
> > > ...and this.
> > >
> >
> > ACK, We can use "linear_range_get_value", but maybe wait for reply
> > about "mt6360_map_reg_sel"
> >
> > > > +static int mt6360_charger_get_ichg(struct mt6360_chg_info *mci,
> > > > + union power_supply_propval *val)
> > > > +{
> > > > + int ret;
> > > > + unsigned int regval;
> > > > +
> > > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL7,
> > > > ®val);
> > > > + if (ret < 0)
> > > > + return ret;
> > > > + regval = (regval & MT6360_ICHG_MASK) >> MT6360_ICHG_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_ICHG_MIN,
> > > > + MT6360_ICHG_MAX,
> > > > + MT6360_ICHG_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + 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 ret;
> > > > + unsigned int regval;
> > > > +
> > > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL4,
> > > > ®val);
> > > > + if (ret < 0)
> > > > + return ret;
> > > > + regval = (regval & MT6360_VOREG_MASK) >> MT6360_VOREG_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_VOREG_MIN,
> > > > + MT6360_VOREG_MAX,
> > > > + MT6360_VOREG_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + 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_IAICR_MASK) >> MT6360_IAICR_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_AICR_MIN,
> > > > + MT6360_AICR_MAX,
> > > > + MT6360_AICR_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return 0;
> > > > +}
> > > > +
> > > > +static int mt6360_charger_get_mivr(struct mt6360_chg_info *mci,
> > > > + union power_supply_propval *val)
> > > > +{
> > > > + int ret;
> > > > + unsigned int regval;
> > > > +
> > > > + ret = regmap_read(mci->regmap, MT6360_PMU_CHG_CTRL6,
> > > > ®val);
> > > > + if (ret < 0)
> > > > + return ret;
> > > > + regval = (regval & MT6360_VMIVR_MASK) >> MT6360_VMIVR_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_VMIVR_MIN,
> > > > + MT6360_VMIVR_MAX,
> > > > + MT6360_VMIVR_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + 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_IPREC_MASK) >> MT6360_IPREC_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_IPREC_MIN,
> > > > + MT6360_IPREC_MAX,
> > > > + MT6360_IPREC_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + 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_IEOC_MASK) >> MT6360_IEOC_SHFT;
> > > > + val->intval = mt6360_map_real_val(regval,
> > > > + MT6360_IEOC_MIN,
> > > > + MT6360_IEOC_MAX,
> > > > + MT6360_IEOC_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + 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_FSLP_MASK,
> > > > + force_sleep << MT6360_FSLP_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_ichg(struct mt6360_chg_info *mci,
> > > > + const union power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_ICHG_MIN,
> > > > + MT6360_ICHG_MAX,
> > > > + MT6360_ICHG_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL7,
> > > > + MT6360_ICHG_MASK,
> > > > + sel << MT6360_ICHG_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_cv(struct mt6360_chg_info *mci,
> > > > + const union power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_VOREG_MIN,
> > > > + MT6360_VOREG_MAX,
> > > > + MT6360_VOREG_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL4,
> > > > + MT6360_VOREG_MASK,
> > > > + sel << MT6360_VOREG_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_aicr(struct mt6360_chg_info *mci,
> > > > + const union power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_AICR_MIN,
> > > > + MT6360_AICR_MAX,
> > > > + MT6360_AICR_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL3,
> > > > + MT6360_IAICR_MASK,
> > > > + sel << MT6360_IAICR_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_mivr(struct mt6360_chg_info *mci,
> > > > + const union power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_VMIVR_MIN,
> > > > + MT6360_VMIVR_MAX,
> > > > + MT6360_VMIVR_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL3,
> > > > + MT6360_VMIVR_MASK,
> > > > + sel << MT6360_VMIVR_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_iprechg(struct mt6360_chg_info
> > > > *mci,
> > > > + const union
> > > > power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_IPREC_MIN,
> > > > + MT6360_IPREC_MAX,
> > > > + MT6360_IPREC_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL8,
> > > > + MT6360_IPREC_MASK,
> > > > + sel << MT6360_IPREC_SHFT);
> > > > +}
> > > > +
> > > > +static int mt6360_charger_set_ieoc(struct mt6360_chg_info *mci,
> > > > + const union power_supply_propval
> > > > *val)
> > > > +{
> > > > + u8 sel;
> > > > +
> > > > + sel = mt6360_map_reg_sel(val->intval,
> > > > + MT6360_IEOC_MIN,
> > > > + MT6360_IEOC_MAX,
> > > > + MT6360_IEOC_STEP);
> > >
> > > linear_ranges?
> > >
> > > > + return regmap_update_bits(mci->regmap,
> > > > + MT6360_PMU_CHG_CTRL9,
> > > > + MT6360_IEOC_MASK,
> > > > + sel << MT6360_IEOC_SHFT);
> > > > +}
> > > > +
> > > > +
> > >
> > >
> > > > +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,
> > > > + .n_voltages = 57,
> > > > + .vsel_reg = MT6360_PMU_CHG_CTRL5,
> > > > + .vsel_mask = MT6360_VOBST_MASK,
> > > > + .enable_reg = MT6360_PMU_CHG_CTRL1,
> > > > + .enable_mask = MT6360_OPA_MODE_MASK,
> > > > +};
> > >
> > > Any particular reason why these are here and not in a regulator
> > > driver?
> > >
> >
> > MT6360 charger is a switching charger which can charging or boost OTG
> > VBUS.
> >
>
> I see. It was just strange for me to see the regulators being set-up in
> the charger driver. I would have expected to see separate regulator
> driver for this, I guess this is MFD in any case, right? So I would
> have expected seeing a sub-device for regulators.
>
> I however see we have couple of other charger drivers here doing the
> same thing (setting up regulators in charger driver) - so if this is
> normal then I for sure have no objections :)
>
ACK, it's normal.
> > > ...
> > >
> > > > +static int mt6360_charger_probe(struct platform_device *pdev)
> > > > +{
> > > > + 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;
> > > > +
> > > > + ret = mt6360_parse_dt(pdev);
> > > > + if (ret)
> > > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > > parse
> > > > dt\n");
> > > > +
> > > > + mci->dev = &pdev->dev;
> > > > + mci->vinovp = 6500000;
> > > > + 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)
> > > > + return dev_err_probe(&pdev->dev, -ENODEV, "Failed
> > > > to
> > > > get parent regmap\n");
> > > > +
> > > > + ret = mt6360_apply_dt(pdev);
> > > > + if (ret)
> > > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > > apply
> > > > dt\n");
> > > > +
> > > > + 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;
> > > > + mci->psy = devm_power_supply_register(&pdev->dev,
> > > > + &mci->psy_desc,
> > > > &charger_cfg);
> > > > + if (IS_ERR(mci->psy))
> > > > + return dev_err_probe(&pdev->dev, PTR_ERR(mci->psy),
> > > > + "Failed to register power
> > > > supply
> > > > dev\n");
> > > > +
> > > > + ret = mt6360_chg_init_setting(mci);
> > > > + if (ret)
> > > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > > initial setting\n");
> > > > +
> > > > + schedule_work(&mci->chrdet_work);
> > >
> > > Is this work scheduled anywhere else? If not - why doing this in wq
> > > context? If yes - does this wq need cancellation upon exit?
> > >
> >
> > MT6360 MFD driver probe will clear all interrupts then add charger
> > device.
> > We need to schedule work for handling boot-up vbus is always exist,
> > because irq is already cleared.
> >
>
> Thank you for the explanation. I was just wondering why not checking
> charger status right here? I didn't understand why the checking was
> pushed to a WQ. You probably have a valid reason. I assume it's just me
> who is not understanding this :) Additionally I was wondering what
> happens if for example the IRQ registration below fails and we detach
> the driver - I don't see work-queue being flushed. Thanks for all the
> explanations!
>
ACK, I will add error handling by cancel_work_sync.
> > > > +
> > > > + ret = mt6360_chg_irq_register(pdev);
> > > > + if (ret)
> > > > + return dev_err_probe(&pdev->dev, ret, "Failed to
> > > > register irqs\n");
> > > > +
> > > > + 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);
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
>
On Thu, 2021-05-27 at 17:58 +0800, Gene Chen wrote:
> Matti Vaittinen <[email protected]> 於 2021年5月27日 週四
> 下午12:25寫道：
> >
> > On Wed, 2021-05-26 at 17:40 +0800, Gene Chen wrote:
> > > Matti Vaittinen <[email protected]> 於 2021年3月30日
> > > 週二
> > > 下午7:48寫道：
> > > > On Mon, 2021-01-18 at 20:41 +0800, Gene Chen wrote:
> > > > > From: Gene Chen <[email protected]>
> > > > >
> > > > > Add basic support for the battery charger for MT6360 PMIC
> > > > >
> > > > > Signed-off-by: Gene Chen <[email protected]>
> > > > > ---
> > > > > drivers/power/supply/Kconfig | 10 +
> > > > > drivers/power/supply/Makefile | 1 +
> > > > > drivers/power/supply/mt6360_charger.c | 914
> > > > > ++++++++++++++++++++++++++++++++++
> > > > > 3 files changed, 925 insertions(+)
> > > > > create mode 100644 drivers/power/supply/mt6360_charger.c
> > > > >
> > > >
> > > > Thanks for the contribution :)
> > > >
> > > > Few comments which I am not demanding to be 'fixed' - but which
> > > > might
> > > > be good to be checked. Eg, please consider my comments as
> > > > 'nit's.
> > > >
> > > > ...
> > > >
> > > > > +static unsigned int mt6360_map_reg_sel(u32 data, u32 min,
> > > > > u32
> > > > > max,
> > > > > u32 step)
> > > > > +{
> > > > > + u32 target = 0, max_sel;
> > > > > +
> > > > > + if (data >= min) {
> > > > > + target = (data - min) / step;
> > > > > + max_sel = (max - min) / step;
> > > > > + if (target > max_sel)
> > > > > + target = max_sel;
> > > > > + }
> > > > > + return target;
> > > > > +}
> > > >
> > > > lib/linear_ranges.c might already implement this ...
> > > >
> > >
> > > I found we are neither linear_range_get_selector_high or
> > > linear_range_get_selector_low.
> > > When value lower than min_value, choose min_sel. If higher than
> > > max_value, choose max_sel.
> >
> > Ah, correct.
> >
> > > Should I create linear_range_get_selector() for this?
> >
> > My suggestion would be yes, but I am not insisting on it.
> >
>
> Maybe this is a special choosing mechanism, I will keep it.
> Could I also keep mt6360_map_real_val?
I think adding generic function to linear range code for others to re-
use would be nice. But if you choose to keep the mt6360_map_reg_sel()
then it I agree that you should also keep the mt6360_map_real_val().
Best regards
Matti Vaittinen