[v4,1/2] power: supply: add Qualcomm PMI8998 SMB2 Charger driver

Add a driver for the SMB2 charger block found in the Qualcomm PMI8998
and PM660.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
Changes since v1:
 * Renamed from qcom_smb2 to qcom_pmi8998_charger
---
 drivers/power/supply/Kconfig                |    9 +
 drivers/power/supply/Makefile               |    1 +
 drivers/power/supply/qcom_pmi8998_charger.c | 1044 +++++++++++++++++++
 3 files changed, 1054 insertions(+)
 create mode 100644 drivers/power/supply/qcom_pmi8998_charger.c

Hi Caleb,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on sre-power-supply/for-next]
[also build test WARNING on robh/for-next linus/master v5.19-rc5 next-20220707]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Caleb-Connolly/power-supply-introduce-support-for-the-Qualcomm-smb2-charger/20220707-034307
base:   https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git for-next
config: arm64-allmodconfig (https://download.01.org/0day-ci/archive/20220707/202207072358.2odInqXi-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project f553287b588916de09c66e3e32bf75e5060f967f)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install arm64 cross compiling tool for clang build
        # apt-get install binutils-aarch64-linux-gnu
        # https://github.com/intel-lab-lkp/linux/commit/a6b315467a158024bb1af7fed00c9a5227c9b293
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Caleb-Connolly/power-supply-introduce-support-for-the-Qualcomm-smb2-charger/20220707-034307
        git checkout a6b315467a158024bb1af7fed00c9a5227c9b293
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/power/supply/

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/power/supply/qcom_pmi8998_charger.c:425:5: warning: no previous prototype for function 'smb2_get_prop_usb_online' [-Wmissing-prototypes]
   int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val)
       ^
   drivers/power/supply/qcom_pmi8998_charger.c:425:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:486:5: warning: no previous prototype for function 'smb2_get_prop_status' [-Wmissing-prototypes]
   int smb2_get_prop_status(struct smb2_chip *chip, int *val)
       ^
   drivers/power/supply/qcom_pmi8998_charger.c:486:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   int smb2_get_prop_status(struct smb2_chip *chip, int *val)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:565:6: warning: no previous prototype for function 'smb2_status_change_work' [-Wmissing-prototypes]
   void smb2_status_change_work(struct work_struct *work)
        ^
   drivers/power/supply/qcom_pmi8998_charger.c:565:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   void smb2_status_change_work(struct work_struct *work)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:614:5: warning: no previous prototype for function 'smb2_get_iio_chan' [-Wmissing-prototypes]
   int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan,
       ^
   drivers/power/supply/qcom_pmi8998_charger.c:614:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan,
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:635:5: warning: no previous prototype for function 'smb2_get_prop_health' [-Wmissing-prototypes]
   int smb2_get_prop_health(struct smb2_chip *chip, int *val)
       ^
   drivers/power/supply/qcom_pmi8998_charger.c:635:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   int smb2_get_prop_health(struct smb2_chip *chip, int *val)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:736:13: warning: no previous prototype for function 'smb2_handle_batt_overvoltage' [-Wmissing-prototypes]
   irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data)
               ^
   drivers/power/supply/qcom_pmi8998_charger.c:736:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:754:13: warning: no previous prototype for function 'smb2_handle_usb_plugin' [-Wmissing-prototypes]
   irqreturn_t smb2_handle_usb_plugin(int irq, void *data)
               ^
   drivers/power/supply/qcom_pmi8998_charger.c:754:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   irqreturn_t smb2_handle_usb_plugin(int irq, void *data)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:766:13: warning: no previous prototype for function 'smb2_handle_usb_icl_change' [-Wmissing-prototypes]
   irqreturn_t smb2_handle_usb_icl_change(int irq, void *data)
               ^
   drivers/power/supply/qcom_pmi8998_charger.c:766:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   irqreturn_t smb2_handle_usb_icl_change(int irq, void *data)
   ^
   static 
>> drivers/power/supply/qcom_pmi8998_charger.c:775:13: warning: no previous prototype for function 'smb2_handle_wdog_bark' [-Wmissing-prototypes]
   irqreturn_t smb2_handle_wdog_bark(int irq, void *data)
               ^
   drivers/power/supply/qcom_pmi8998_charger.c:775:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   irqreturn_t smb2_handle_wdog_bark(int irq, void *data)
   ^
   static 
   drivers/power/supply/qcom_pmi8998_charger.c:896:12: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
             .addr = 1950000 / 25000 },
                     ^~~~~~~~~~~~~~~
   drivers/power/supply/qcom_pmi8998_charger.c:894:12: note: previous initialization is here
           { .addr = FAST_CHARGE_CURRENT_CFG,
                     ^~~~~~~~~~~~~~~~~~~~~~~
   drivers/power/supply/qcom_pmi8998_charger.c:76:36: note: expanded from macro 'FAST_CHARGE_CURRENT_CFG'
   #define FAST_CHARGE_CURRENT_CFG                         0x61
                                                           ^~~~
   10 warnings generated.


vim +/smb2_get_prop_usb_online +425 drivers/power/supply/qcom_pmi8998_charger.c

   424	
 > 425	int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val)
   426	{
   427		unsigned int stat;
   428		int rc;
   429	
   430		rc = regmap_read(chip->regmap, chip->base + POWER_PATH_STATUS, &stat);
   431		if (rc < 0) {
   432			dev_err(chip->dev, "Couldn't read POWER_PATH_STATUS! ret=%d\n",
   433				rc);
   434			return rc;
   435		}
   436	
   437		*val = (stat & P_PATH_USE_USBIN_BIT) &&
   438		       (stat & P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT);
   439		return 0;
   440	}
   441	
   442	/*
   443	 * Qualcomm "automatic power source detection" aka APSD
   444	 * tells us what type of charger we're connected to.
   445	 */
   446	static int smb2_apsd_get_charger_type(struct smb2_chip *chip, int *val)
   447	{
   448		int rc;
   449		unsigned int apsd_stat, stat;
   450		int usb_online;
   451	
   452		rc = smb2_get_prop_usb_online(chip, &usb_online);
   453		if (rc < 0 || !usb_online) {
   454			*val = POWER_SUPPLY_USB_TYPE_UNKNOWN;
   455			return 0;
   456		}
   457	
   458		rc = regmap_read(chip->regmap, chip->base + APSD_STATUS, &apsd_stat);
   459		if (rc < 0) {
   460			dev_err(chip->dev, "Failed to read apsd status, rc = %d", rc);
   461			return rc;
   462		}
   463		if (!(apsd_stat & APSD_DTC_STATUS_DONE_BIT)) {
   464			dev_err(chip->dev, "Apsd not ready");
   465			return -EAGAIN;
   466		}
   467	
   468		rc = regmap_read(chip->regmap, chip->base + APSD_RESULT_STATUS, &stat);
   469		if (rc < 0) {
   470			dev_err(chip->dev, "Failed to read apsd result, rc = %d", rc);
   471			return rc;
   472		}
   473	
   474		stat &= APSD_RESULT_STATUS_MASK;
   475	
   476		if (stat & CDP_CHARGER_BIT)
   477			*val = POWER_SUPPLY_USB_TYPE_CDP;
   478		else if (stat & (DCP_CHARGER_BIT | OCP_CHARGER_BIT | FLOAT_CHARGER_BIT))
   479			*val = POWER_SUPPLY_USB_TYPE_DCP;
   480		else /* SDP_CHARGER_BIT (or others) */
   481			*val = POWER_SUPPLY_USB_TYPE_SDP;
   482	
   483		return 0;
   484	}
   485	
 > 486	int smb2_get_prop_status(struct smb2_chip *chip, int *val)
   487	{
   488		int usb_online_val;
   489		unsigned char stat[2];
   490		int rc;
   491	
   492		rc = smb2_get_prop_usb_online(chip, &usb_online_val);
   493		if (rc < 0) {
   494			dev_err(chip->dev, "Couldn't get usb online property rc = %d\n",
   495				rc);
   496			return rc;
   497		}
   498	
   499		if (!usb_online_val) {
   500			*val = POWER_SUPPLY_STATUS_DISCHARGING;
   501			return rc;
   502		}
   503	
   504		rc = regmap_bulk_read(chip->regmap,
   505				      chip->base + BATTERY_CHARGER_STATUS_1, &stat, 2);
   506		if (rc < 0) {
   507			dev_err(chip->dev, "Failed to read charging status ret=%d\n",
   508				rc);
   509			return rc;
   510		}
   511	
   512		if (stat[1] & CHARGER_ERROR_STATUS_BAT_OV_BIT) {
   513			*val = POWER_SUPPLY_STATUS_NOT_CHARGING;
   514			return 0;
   515		}
   516	
   517		stat[0] = stat[0] & BATTERY_CHARGER_STATUS_MASK;
   518	
   519		switch (stat[0]) {
   520		case TRICKLE_CHARGE:
   521		case PRE_CHARGE:
   522		case FAST_CHARGE:
   523		case FULLON_CHARGE:
   524		case TAPER_CHARGE:
   525			*val = POWER_SUPPLY_STATUS_CHARGING;
   526			return rc;
   527		case DISABLE_CHARGE:
   528			*val = POWER_SUPPLY_STATUS_NOT_CHARGING;
   529			return rc;
   530		case TERMINATE_CHARGE:
   531			*val = POWER_SUPPLY_STATUS_FULL;
   532			return rc;
   533		case INHIBIT_CHARGE:
   534		default:
   535			*val = POWER_SUPPLY_STATUS_UNKNOWN;
   536			return rc;
   537		}
   538	}
   539	
   540	static inline int smb2_get_current_limit(struct smb2_chip *chip,
   541						 unsigned int *val)
   542	{
   543		int rc = regmap_read(chip->regmap, chip->base + ICL_STATUS, val);
   544	
   545		if (rc >= 0)
   546			*val *= 25000;
   547		return rc;
   548	}
   549	
   550	static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int val)
   551	{
   552		unsigned char val_raw;
   553	
   554		if (val > 4800000) {
   555			dev_err(chip->dev,
   556				"Can't set current limit higher than 4800000uA");
   557			return -EINVAL;
   558		}
   559		val_raw = val / 25000;
   560	
   561		return regmap_write(chip->regmap, chip->base + USBIN_CURRENT_LIMIT_CFG,
   562				    val_raw);
   563	}
   564	
 > 565	void smb2_status_change_work(struct work_struct *work)
   566	{
   567		struct smb2_chip *chip =
   568			container_of(work, struct smb2_chip, status_change_work.work);
   569		unsigned int charger_type, current_ua;
   570		int usb_online, count, rc;
   571	
   572		smb2_get_prop_usb_online(chip, &usb_online);
   573		if (usb_online == 0) {
   574			chip->default_curr_limit = 0;
   575			return;
   576		}
   577	
   578		for (count = 0; count < 3; count++) {
   579			dev_dbg(chip->dev, "get charger type retry %d\n", count);
   580			rc = smb2_apsd_get_charger_type(chip, &charger_type);
   581			if (rc == 0)
   582				break;
   583			msleep(100);
   584		}
   585	
   586		if (rc < 0) {
   587			rc = regmap_update_bits(chip->regmap, chip->base + CMD_APSD,
   588						APSD_RERUN_BIT, APSD_RERUN_BIT);
   589			schedule_delayed_work(&chip->status_change_work,
   590					      msecs_to_jiffies(1500));
   591			dev_dbg(chip->dev, "get charger type failed, rerun apsd\n");
   592			return;
   593		}
   594	
   595		switch (charger_type) {
   596		case POWER_SUPPLY_USB_TYPE_CDP:
   597			current_ua = CDP_CURRENT_UA;
   598			break;
   599		case POWER_SUPPLY_USB_TYPE_DCP:
   600			current_ua = DCP_CURRENT_UA;
   601			break;
   602		case POWER_SUPPLY_USB_TYPE_SDP:
   603		default:
   604			current_ua = SDP_CURRENT_UA;
   605			break;
   606		}
   607	
   608		chip->default_curr_limit = current_ua;
   609	
   610		smb2_set_current_limit(chip, current_ua);
   611		power_supply_changed(chip->chg_psy);
   612	}
   613	
 > 614	int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan,
   615			      int *val)
   616	{
   617		int rc;
   618		union power_supply_propval status;
   619	
   620		rc = power_supply_get_property(chip->chg_psy, POWER_SUPPLY_PROP_STATUS,
   621					       &status);
   622		if (rc < 0 || status.intval != POWER_SUPPLY_STATUS_CHARGING) {
   623			*val = 0;
   624			return 0;
   625		}
   626	
   627		if (IS_ERR(chan)) {
   628			dev_err(chip->dev, "Failed to chan, err = %li", PTR_ERR(chan));
   629			return PTR_ERR(chan);
   630		}
   631	
   632		return iio_read_channel_processed(chan, val);
   633	}
   634

Hi,

On Wed, Jul 06, 2022 at 08:41:24PM +0100, Caleb Connolly wrote:
> Add a driver for the SMB2 charger block found in the Qualcomm PMI8998
> and PM660.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> Changes since v1:
>  * Renamed from qcom_smb2 to qcom_pmi8998_charger

It's a bit weird to have old changelog in the patch and current
changelog in the cover-letter :)

> ---
>  drivers/power/supply/Kconfig                |    9 +
>  drivers/power/supply/Makefile               |    1 +
>  drivers/power/supply/qcom_pmi8998_charger.c | 1044 +++++++++++++++++++
>  3 files changed, 1054 insertions(+)
>  create mode 100644 drivers/power/supply/qcom_pmi8998_charger.c
> 
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index 1aa8323ad9f6..1fd9ad98b607 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -897,4 +897,13 @@ config BATTERY_UG3105
>  	  device is off or suspended, the functionality of this driver is
>  	  limited to reporting capacity only.
>  
> +config CHARGER_QCOM_SMB2
> +	tristate "Qualcomm PMI8998 PMIC charger driver"
> +	depends on MFD_SPMI_PMIC
> +	depends on IIO
> +	help
> +	  Say Y here to enable the Qualcomm PMIC Charger driver. This
> +	  adds support for the SMB2 switch mode battery charger found
> +	  in PMI8998 and related PMICs.
> +
>  endif # POWER_SUPPLY
> diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
> index 7f02f36aea55..a39e3eda6dbd 100644
> --- a/drivers/power/supply/Makefile
> +++ b/drivers/power/supply/Makefile
> @@ -108,3 +108,4 @@ obj-$(CONFIG_BATTERY_ACER_A500)	+= acer_a500_battery.o
>  obj-$(CONFIG_BATTERY_SURFACE)	+= surface_battery.o
>  obj-$(CONFIG_CHARGER_SURFACE)	+= surface_charger.o
>  obj-$(CONFIG_BATTERY_UG3105)	+= ug3105_battery.o
> +obj-$(CONFIG_CHARGER_QCOM_SMB2)	+= qcom_pmi8998_charger.o
> diff --git a/drivers/power/supply/qcom_pmi8998_charger.c b/drivers/power/supply/qcom_pmi8998_charger.c
> new file mode 100644
> index 000000000000..2ba8f83282e1
> --- /dev/null
> +++ b/drivers/power/supply/qcom_pmi8998_charger.c
> @@ -0,0 +1,1044 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
> + * Copyright (c) 2021, Linaro Ltd.

2021-2022

> + * Author: Caleb Connolly <caleb.connolly@linaro.org>
> + *
> + * This driver is for the switch-mode battery charger and boost
> + * hardware found in pmi8998 and related PMICs.
> + */
> +
> +#include <linux/bits.h>
> +#include <linux/devm-helpers.h>
> +#include <linux/iio/consumer.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/minmax.h>
> +#include <linux/of_irq.h>
> +#include <linux/module.h>
> +#include <linux/debugfs.h>
> +
> +#include <linux/platform_device.h>
> +#include <linux/power_supply.h>
> +#include <linux/regmap.h>
> +#include <linux/types.h>
> +#include <linux/workqueue.h>
> +
> +// clang-format off
> +#define BATTERY_CHARGER_STATUS_1			0x06
> +#define BVR_INITIAL_RAMP_BIT				BIT(7)
> +#define CC_SOFT_TERMINATE_BIT				BIT(6)
> +#define STEP_CHARGING_STATUS_SHIFT			3
> +#define STEP_CHARGING_STATUS_MASK			GENMASK(5, 3)
> +#define BATTERY_CHARGER_STATUS_MASK			GENMASK(2, 0)
> +
> +#define BATTERY_CHARGER_STATUS_2			0x07
> +#define INPUT_CURRENT_LIMITED_BIT			BIT(7)
> +#define CHARGER_ERROR_STATUS_SFT_EXPIRE_BIT		BIT(6)
> +#define CHARGER_ERROR_STATUS_BAT_OV_BIT			BIT(5)
> +#define CHARGER_ERROR_STATUS_BAT_TERM_MISSING_BIT	BIT(4)
> +#define BAT_TEMP_STATUS_MASK				GENMASK(3, 0)
> +#define BAT_TEMP_STATUS_SOFT_LIMIT_MASK			GENMASK(3, 2)
> +#define BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT		BIT(3)
> +#define BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT		BIT(2)
> +#define BAT_TEMP_STATUS_TOO_HOT_BIT			BIT(1)
> +#define BAT_TEMP_STATUS_TOO_COLD_BIT			BIT(0)
> +
> +#define BATTERY_CHARGER_STATUS_4			0x0A
> +#define CHARGE_CURRENT_POST_JEITA_MASK			GENMASK(7, 0)
> +
> +#define BATTERY_CHARGER_STATUS_7			0x0D
> +#define ENABLE_TRICKLE_BIT				BIT(7)
> +#define ENABLE_PRE_CHARGING_BIT				BIT(6)
> +#define ENABLE_FAST_CHARGING_BIT			BIT(5)
> +#define ENABLE_FULLON_MODE_BIT				BIT(4)
> +#define TOO_COLD_ADC_BIT				BIT(3)
> +#define TOO_HOT_ADC_BIT					BIT(2)
> +#define HOT_SL_ADC_BIT					BIT(1)
> +#define COLD_SL_ADC_BIT					BIT(0)
> +
> +#define CHARGING_ENABLE_CMD				0x42
> +#define CHARGING_ENABLE_CMD_BIT				BIT(0)
> +
> +#define CHGR_CFG2					0x51
> +#define CHG_EN_SRC_BIT					BIT(7)
> +#define CHG_EN_POLARITY_BIT				BIT(6)
> +#define PRETOFAST_TRANSITION_CFG_BIT			BIT(5)
> +#define BAT_OV_ECC_BIT					BIT(4)
> +#define I_TERM_BIT					BIT(3)
> +#define AUTO_RECHG_BIT					BIT(2)
> +#define EN_ANALOG_DROP_IN_VBATT_BIT			BIT(1)
> +#define CHARGER_INHIBIT_BIT				BIT(0)
> +
> +#define PRE_CHARGE_CURRENT_CFG				0x60
> +#define PRE_CHARGE_CURRENT_SETTING_MASK			GENMASK(5, 0)
> +
> +#define FAST_CHARGE_CURRENT_CFG				0x61
> +#define FAST_CHARGE_CURRENT_SETTING_MASK		GENMASK(7, 0)
> +
> +#define FLOAT_VOLTAGE_CFG				0x70
> +#define FLOAT_VOLTAGE_SETTING_MASK			GENMASK(7, 0)
> +
> +#define FG_UPDATE_CFG_2_SEL				0x7D
> +#define SOC_LT_OTG_THRESH_SEL_BIT			BIT(3)
> +#define SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT		BIT(2)
> +#define VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT		BIT(1)
> +#define IBT_LT_CHG_TERM_THRESH_SEL_BIT			BIT(0)
> +
> +#define JEITA_EN_CFG					0x90
> +#define JEITA_EN_HARDLIMIT_BIT				BIT(4)
> +#define JEITA_EN_HOT_SL_FCV_BIT				BIT(3)
> +#define JEITA_EN_COLD_SL_FCV_BIT			BIT(2)
> +#define JEITA_EN_HOT_SL_CCC_BIT				BIT(1)
> +#define JEITA_EN_COLD_SL_CCC_BIT			BIT(0)
> +
> +#define INT_RT_STS					0x310
> +#define TYPE_C_CHANGE_RT_STS_BIT			BIT(7)
> +#define USBIN_ICL_CHANGE_RT_STS_BIT			BIT(6)
> +#define USBIN_SOURCE_CHANGE_RT_STS_BIT			BIT(5)
> +#define USBIN_PLUGIN_RT_STS_BIT				BIT(4)
> +#define USBIN_OV_RT_STS_BIT				BIT(3)
> +#define USBIN_UV_RT_STS_BIT				BIT(2)
> +#define USBIN_LT_3P6V_RT_STS_BIT			BIT(1)
> +#define USBIN_COLLAPSE_RT_STS_BIT			BIT(0)
> +
> +#define OTG_CFG						0x153
> +#define OTG_RESERVED_MASK				GENMASK(7, 6)
> +#define DIS_OTG_ON_TLIM_BIT				BIT(5)
> +#define QUICKSTART_OTG_FASTROLESWAP_BIT			BIT(4)
> +#define INCREASE_DFP_TIME_BIT				BIT(3)
> +#define ENABLE_OTG_IN_DEBUG_MODE_BIT			BIT(2)
> +#define OTG_EN_SRC_CFG_BIT				BIT(1)
> +#define CONCURRENT_MODE_CFG_BIT				BIT(0)
> +
> +#define OTG_ENG_OTG_CFG					0x1C0
> +#define ENG_BUCKBOOST_HALT1_8_MODE_BIT			BIT(0)
> +
> +#define APSD_STATUS					0x307
> +#define APSD_STATUS_7_BIT				BIT(7)
> +#define HVDCP_CHECK_TIMEOUT_BIT				BIT(6)
> +#define SLOW_PLUGIN_TIMEOUT_BIT				BIT(5)
> +#define ENUMERATION_DONE_BIT				BIT(4)
> +#define VADP_CHANGE_DONE_AFTER_AUTH_BIT			BIT(3)
> +#define QC_AUTH_DONE_STATUS_BIT				BIT(2)
> +#define QC_CHARGER_BIT					BIT(1)
> +#define APSD_DTC_STATUS_DONE_BIT			BIT(0)
> +
> +#define APSD_RESULT_STATUS				0x308
> +#define ICL_OVERRIDE_LATCH_BIT				BIT(7)
> +#define APSD_RESULT_STATUS_MASK				GENMASK(6, 0)
> +#define QC_3P0_BIT					BIT(6)
> +#define QC_2P0_BIT					BIT(5)
> +#define FLOAT_CHARGER_BIT				BIT(4)
> +#define DCP_CHARGER_BIT					BIT(3)
> +#define CDP_CHARGER_BIT					BIT(2)
> +#define OCP_CHARGER_BIT					BIT(1)
> +#define SDP_CHARGER_BIT					BIT(0)
> +
> +#define TYPE_C_STATUS_1					0x30B
> +#define UFP_TYPEC_MASK					GENMASK(7, 5)
> +#define UFP_TYPEC_RDSTD_BIT				BIT(7)
> +#define UFP_TYPEC_RD1P5_BIT				BIT(6)
> +#define UFP_TYPEC_RD3P0_BIT				BIT(5)
> +#define UFP_TYPEC_FMB_255K_BIT				BIT(4)
> +#define UFP_TYPEC_FMB_301K_BIT				BIT(3)
> +#define UFP_TYPEC_FMB_523K_BIT				BIT(2)
> +#define UFP_TYPEC_FMB_619K_BIT				BIT(1)
> +#define UFP_TYPEC_OPEN_OPEN_BIT				BIT(0)
> +
> +#define TYPE_C_STATUS_2					0x30C
> +#define DFP_RA_OPEN_BIT					BIT(7)
> +#define TIMER_STAGE_BIT					BIT(6)
> +#define EXIT_UFP_MODE_BIT				BIT(5)
> +#define EXIT_DFP_MODE_BIT				BIT(4)
> +#define DFP_TYPEC_MASK					GENMASK(3, 0)
> +#define DFP_RD_OPEN_BIT					BIT(3)
> +#define DFP_RD_RA_VCONN_BIT				BIT(2)
> +#define DFP_RD_RD_BIT					BIT(1)
> +#define DFP_RA_RA_BIT					BIT(0)
> +
> +#define TYPE_C_STATUS_3					0x30D
> +#define ENABLE_BANDGAP_BIT				BIT(7)
> +#define U_USB_GND_NOVBUS_BIT				BIT(6)
> +#define U_USB_FLOAT_NOVBUS_BIT				BIT(5)
> +#define U_USB_GND_BIT					BIT(4)
> +#define U_USB_FMB1_BIT					BIT(3)
> +#define U_USB_FLOAT1_BIT				BIT(2)
> +#define U_USB_FMB2_BIT					BIT(1)
> +#define U_USB_FLOAT2_BIT				BIT(0)
> +
> +#define TYPE_C_STATUS_4					0x30E
> +#define UFP_DFP_MODE_STATUS_BIT				BIT(7)
> +#define TYPEC_VBUS_STATUS_BIT				BIT(6)
> +#define TYPEC_VBUS_ERROR_STATUS_BIT			BIT(5)
> +#define TYPEC_DEBOUNCE_DONE_STATUS_BIT			BIT(4)
> +#define TYPEC_UFP_AUDIO_ADAPT_STATUS_BIT		BIT(3)
> +#define TYPEC_VCONN_OVERCURR_STATUS_BIT			BIT(2)
> +#define CC_ORIENTATION_BIT				BIT(1)
> +#define CC_ATTACHED_BIT					BIT(0)
> +
> +#define TYPE_C_STATUS_5					0x30F
> +#define TRY_SOURCE_FAILED_BIT				BIT(6)
> +#define TRY_SINK_FAILED_BIT				BIT(5)
> +#define TIMER_STAGE_2_BIT				BIT(4)
> +#define TYPEC_LEGACY_CABLE_STATUS_BIT			BIT(3)
> +#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS_BIT		BIT(2)
> +#define TYPEC_TRYSOURCE_DETECT_STATUS_BIT		BIT(1)
> +#define TYPEC_TRYSINK_DETECT_STATUS_BIT			BIT(0)
> +
> +#define CMD_APSD					0x341
> +#define ICL_OVERRIDE_BIT				BIT(1)
> +#define APSD_RERUN_BIT					BIT(0)
> +
> +#define TYPE_C_CFG					0x358
> +#define APSD_START_ON_CC_BIT				BIT(7)
> +#define WAIT_FOR_APSD_BIT				BIT(6)
> +#define FACTORY_MODE_DETECTION_EN_BIT			BIT(5)
> +#define FACTORY_MODE_ICL_3A_4A_BIT			BIT(4)
> +#define FACTORY_MODE_DIS_CHGING_CFG_BIT			BIT(3)
> +#define SUSPEND_NON_COMPLIANT_CFG_BIT			BIT(2)
> +#define VCONN_OC_CFG_BIT				BIT(1)
> +#define TYPE_C_OR_U_USB_BIT				BIT(0)
> +
> +#define TYPE_C_CFG_2					0x359
> +#define TYPE_C_DFP_CURRSRC_MODE_BIT			BIT(7)
> +#define DFP_CC_1P4V_OR_1P6V_BIT				BIT(6)
> +#define VCONN_SOFTSTART_CFG_MASK			GENMASK(5, 4)
> +#define EN_TRY_SOURCE_MODE_BIT				BIT(3)
> +#define USB_FACTORY_MODE_ENABLE_BIT			BIT(2)
> +#define TYPE_C_UFP_MODE_BIT				BIT(1)
> +#define EN_80UA_180UA_CUR_SOURCE_BIT			BIT(0)
> +
> +#define TYPE_C_CFG_3					0x35A
> +#define TVBUS_DEBOUNCE_BIT				BIT(7)
> +#define TYPEC_LEGACY_CABLE_INT_EN_BIT			BIT(6)
> +#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN_B	BIT(5)
> +#define TYPEC_TRYSOURCE_DETECT_INT_EN_BIT		BIT(4)
> +#define TYPEC_TRYSINK_DETECT_INT_EN_BIT			BIT(3)
> +#define EN_TRYSINK_MODE_BIT				BIT(2)
> +#define EN_LEGACY_CABLE_DETECTION_BIT			BIT(1)
> +#define ALLOW_PD_DRING_UFP_TCCDB_BIT			BIT(0)
> +
> +#define USBIN_OPTIONS_1_CFG				0x362
> +#define CABLE_R_SEL_BIT					BIT(7)
> +#define HVDCP_AUTH_ALG_EN_CFG_BIT			BIT(6)
> +#define HVDCP_AUTONOMOUS_MODE_EN_CFG_BIT		BIT(5)
> +#define INPUT_PRIORITY_BIT				BIT(4)
> +#define AUTO_SRC_DETECT_BIT				BIT(3)
> +#define HVDCP_EN_BIT					BIT(2)
> +#define VADP_INCREMENT_VOLTAGE_LIMIT_BIT		BIT(1)
> +#define VADP_TAPER_TIMER_EN_BIT				BIT(0)
> +
> +#define USBIN_OPTIONS_2_CFG				0x363
> +#define WIPWR_RST_EUD_CFG_BIT				BIT(7)
> +#define SWITCHER_START_CFG_BIT				BIT(6)
> +#define DCD_TIMEOUT_SEL_BIT				BIT(5)
> +#define OCD_CURRENT_SEL_BIT				BIT(4)
> +#define SLOW_PLUGIN_TIMER_EN_CFG_BIT			BIT(3)
> +#define FLOAT_OPTIONS_MASK				GENMASK(2, 0)
> +#define FLOAT_DIS_CHGING_CFG_BIT			BIT(2)
> +#define SUSPEND_FLOAT_CFG_BIT				BIT(1)
> +#define FORCE_FLOAT_SDP_CFG_BIT				BIT(0)
> +
> +#define TAPER_TIMER_SEL_CFG				0x364
> +#define TYPEC_SPARE_CFG_BIT				BIT(7)
> +#define TYPEC_DRP_DFP_TIME_CFG_BIT			BIT(5)
> +#define TAPER_TIMER_SEL_MASK				GENMASK(1, 0)
> +
> +#define USBIN_LOAD_CFG					0x365
> +#define USBIN_OV_CH_LOAD_OPTION_BIT			BIT(7)
> +#define ICL_OVERRIDE_AFTER_APSD_BIT			BIT(4)
> +
> +#define USBIN_ICL_OPTIONS				0x366
> +#define CFG_USB3P0_SEL_BIT				BIT(2)
> +#define USB51_MODE_BIT					BIT(1)
> +#define USBIN_MODE_CHG_BIT				BIT(0)
> +
> +#define TYPE_C_INTRPT_ENB_SOFTWARE_CTRL			0x368
> +#define EXIT_SNK_BASED_ON_CC_BIT			BIT(7)
> +#define VCONN_EN_ORIENTATION_BIT			BIT(6)
> +#define TYPEC_VCONN_OVERCURR_INT_EN_BIT			BIT(5)
> +#define VCONN_EN_SRC_BIT				BIT(4)
> +#define VCONN_EN_VALUE_BIT				BIT(3)
> +#define TYPEC_POWER_ROLE_CMD_MASK			GENMASK(2, 0)
> +#define UFP_EN_CMD_BIT					BIT(2)
> +#define DFP_EN_CMD_BIT					BIT(1)
> +#define TYPEC_DISABLE_CMD_BIT				BIT(0)
> +
> +#define USBIN_CURRENT_LIMIT_CFG				0x370
> +#define USBIN_CURRENT_LIMIT_MASK			GENMASK(7, 0)
> +
> +#define USBIN_AICL_OPTIONS_CFG				0x380
> +#define SUSPEND_ON_COLLAPSE_USBIN_BIT			BIT(7)
> +#define USBIN_AICL_HDC_EN_BIT				BIT(6)
> +#define USBIN_AICL_START_AT_MAX_BIT			BIT(5)
> +#define USBIN_AICL_RERUN_EN_BIT				BIT(4)
> +#define USBIN_AICL_ADC_EN_BIT				BIT(3)
> +#define USBIN_AICL_EN_BIT				BIT(2)
> +#define USBIN_HV_COLLAPSE_RESPONSE_BIT			BIT(1)
> +#define USBIN_LV_COLLAPSE_RESPONSE_BIT			BIT(0)
> +
> +#define USBIN_5V_AICL_THRESHOLD_CFG			0x381
> +#define USBIN_5V_AICL_THRESHOLD_CFG_MASK		GENMASK(2, 0)
> +
> +#define USBIN_CONT_AICL_THRESHOLD_CFG			0x384
> +#define USBIN_CONT_AICL_THRESHOLD_CFG_MASK		GENMASK(5, 0)
> +
> +#define DC_ENG_SSUPPLY_CFG2				0x4C1
> +#define ENG_SSUPPLY_IVREF_OTG_SS_MASK			GENMASK(2, 0)
> +#define OTG_SS_SLOW					0x3
> +
> +#define DCIN_AICL_REF_SEL_CFG				0x481
> +#define DCIN_CONT_AICL_THRESHOLD_CFG_MASK		GENMASK(5, 0)
> +
> +#define WI_PWR_OPTIONS					0x495
> +#define CHG_OK_BIT					BIT(7)
> +#define WIPWR_UVLO_IRQ_OPT_BIT				BIT(6)
> +#define BUCK_HOLDOFF_ENABLE_BIT				BIT(5)
> +#define CHG_OK_HW_SW_SELECT_BIT				BIT(4)
> +#define WIPWR_RST_ENABLE_BIT				BIT(3)
> +#define DCIN_WIPWR_IRQ_SELECT_BIT			BIT(2)
> +#define AICL_SWITCH_ENABLE_BIT				BIT(1)
> +#define ZIN_ICL_ENABLE_BIT				BIT(0)
> +
> +#define ICL_STATUS					0x607
> +#define INPUT_CURRENT_LIMIT_MASK			GENMASK(7, 0)
> +
> +#define POWER_PATH_STATUS				0x60B
> +#define P_PATH_INPUT_SS_DONE_BIT			BIT(7)
> +#define P_PATH_USBIN_SUSPEND_STS_BIT			BIT(6)
> +#define P_PATH_DCIN_SUSPEND_STS_BIT			BIT(5)
> +#define P_PATH_USE_USBIN_BIT				BIT(4)
> +#define P_PATH_USE_DCIN_BIT				BIT(3)
> +#define P_PATH_POWER_PATH_MASK				GENMASK(2, 1)
> +#define P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT		BIT(0)
> +
> +#define BARK_BITE_WDOG_PET				0x643
> +#define BARK_BITE_WDOG_PET_BIT				BIT(0)
> +
> +#define WD_CFG						0x651
> +#define WATCHDOG_TRIGGER_AFP_EN_BIT			BIT(7)
> +#define BARK_WDOG_INT_EN_BIT				BIT(6)
> +#define BITE_WDOG_INT_EN_BIT				BIT(5)
> +#define SFT_AFTER_WDOG_IRQ_MASK				GENMASK(4, 3)
> +#define WDOG_IRQ_SFT_BIT				BIT(2)
> +#define WDOG_TIMER_EN_ON_PLUGIN_BIT			BIT(1)
> +#define WDOG_TIMER_EN_BIT				BIT(0)
> +
> +#define SNARL_BARK_BITE_WD_CFG				0x653
> +#define BITE_WDOG_DISABLE_CHARGING_CFG_BIT		BIT(7)
> +#define SNARL_WDOG_TIMEOUT_MASK				GENMASK(6, 4)
> +#define BARK_WDOG_TIMEOUT_MASK				GENMASK(3, 2)
> +#define BITE_WDOG_TIMEOUT_MASK				GENMASK(1, 0)
> +
> +#define AICL_RERUN_TIME_CFG				0x661
> +#define AICL_RERUN_TIME_MASK				GENMASK(1, 0)
> +
> +#define STAT_CFG					0x690
> +#define STAT_SW_OVERRIDE_VALUE_BIT			BIT(7)
> +#define STAT_SW_OVERRIDE_CFG_BIT			BIT(6)
> +#define STAT_PARALLEL_OFF_DG_CFG_MASK			GENMASK(5, 4)
> +#define STAT_POLARITY_CFG_BIT				BIT(3)
> +#define STAT_PARALLEL_CFG_BIT				BIT(2)
> +#define STAT_FUNCTION_CFG_BIT				BIT(1)
> +#define STAT_IRQ_PULSING_EN_BIT				BIT(0)
> +
> +#define USBIN_CURRENT_25MA				25000
> +#define USBIN_CURRENT_100MA				100000
> +#define USBIN_CURRENT_150MA				150000
> +#define USBIN_CURRENT_500MA				500000
> +#define USBIN_CURRENT_900MA				900000
> +#define SDP_CURRENT_UA					500000
> +#define CDP_CURRENT_UA					1500000
> +#define DCP_CURRENT_UA					1500000
> +#define CURRENT_MAX_UA DCP_CURRENT_UA
> +// clang-format on
> +
> +enum charger_status {
> +	TRICKLE_CHARGE = 0,
> +	PRE_CHARGE,
> +	FAST_CHARGE,
> +	FULLON_CHARGE,
> +	TAPER_CHARGE,
> +	TERMINATE_CHARGE,
> +	INHIBIT_CHARGE,
> +	DISABLE_CHARGE,
> +};
> +
> +struct smb2_register {
> +	u16 addr;
> +	u8 mask;
> +	u8 val;
> +};
> +
> +/**
> + * struct smb2_chip - smb2 chip structure
> + * @dev:		Device reference for power_supply
> + * @name:		The platform device name
> + * @base:		Base address for smb2 registers
> + * @regmap:		Register map
> + * @batt_info:		Battery data from DT
> + * @status_change_work: Worker to handle plug/unplug events
> + * @usb_in_i_chan:	USB_IN current measurement channel
> + * @usb_in_v_chan:	USB_IN voltage measurement channel
> + * @chg_psy:		Charger power supply instance
> + * @default_curr_limit:	The default current limit from the APSD, used
> + *			for CHARGE_CONTROL_LIMIT_MAX
> + */
> +struct smb2_chip {
> +	struct device *dev;
> +	const char *name;
> +	unsigned int base;
> +	struct regmap *regmap;
> +	struct power_supply_battery_info *batt_info;
> +
> +	struct delayed_work status_change_work;
> +
> +	struct iio_channel *usb_in_i_chan;
> +	struct iio_channel *usb_in_v_chan;
> +
> +	struct power_supply *chg_psy;
> +	long default_curr_limit;
> +};
> +
> +static enum power_supply_property smb2_properties[] = {
> +	POWER_SUPPLY_PROP_MANUFACTURER,
> +	POWER_SUPPLY_PROP_MODEL_NAME,
> +	POWER_SUPPLY_PROP_CURRENT_MAX,
> +	POWER_SUPPLY_PROP_CURRENT_NOW,
> +	POWER_SUPPLY_PROP_VOLTAGE_NOW,
> +	POWER_SUPPLY_PROP_STATUS,
> +	POWER_SUPPLY_PROP_HEALTH,
> +	POWER_SUPPLY_PROP_ONLINE,
> +	POWER_SUPPLY_PROP_USB_TYPE,
> +	POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
> +	POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
> +};
> +
> +static enum power_supply_usb_type smb2_usb_types[] = {
> +	POWER_SUPPLY_USB_TYPE_UNKNOWN,
> +	POWER_SUPPLY_USB_TYPE_SDP,
> +	POWER_SUPPLY_USB_TYPE_DCP,
> +	POWER_SUPPLY_USB_TYPE_CDP,
> +};
> +
> +int smb2_get_prop_usb_online(struct smb2_chip *chip, int *val)

static int

> +{
> +	unsigned int stat;
> +	int rc;
> +
> +	rc = regmap_read(chip->regmap, chip->base + POWER_PATH_STATUS, &stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't read POWER_PATH_STATUS! ret=%d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	*val = (stat & P_PATH_USE_USBIN_BIT) &&
> +	       (stat & P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT);
> +	return 0;
> +}
> +
> +/*
> + * Qualcomm "automatic power source detection" aka APSD
> + * tells us what type of charger we're connected to.
> + */
> +static int smb2_apsd_get_charger_type(struct smb2_chip *chip, int *val)
> +{
> +	int rc;
> +	unsigned int apsd_stat, stat;
> +	int usb_online;
> +
> +	rc = smb2_get_prop_usb_online(chip, &usb_online);
> +	if (rc < 0 || !usb_online) {
> +		*val = POWER_SUPPLY_USB_TYPE_UNKNOWN;
> +		return 0;
> +	}
> +
> +	rc = regmap_read(chip->regmap, chip->base + APSD_STATUS, &apsd_stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Failed to read apsd status, rc = %d", rc);
> +		return rc;
> +	}
> +	if (!(apsd_stat & APSD_DTC_STATUS_DONE_BIT)) {
> +		dev_err(chip->dev, "Apsd not ready");
> +		return -EAGAIN;
> +	}
> +
> +	rc = regmap_read(chip->regmap, chip->base + APSD_RESULT_STATUS, &stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Failed to read apsd result, rc = %d", rc);
> +		return rc;
> +	}
> +
> +	stat &= APSD_RESULT_STATUS_MASK;
> +
> +	if (stat & CDP_CHARGER_BIT)
> +		*val = POWER_SUPPLY_USB_TYPE_CDP;
> +	else if (stat & (DCP_CHARGER_BIT | OCP_CHARGER_BIT | FLOAT_CHARGER_BIT))
> +		*val = POWER_SUPPLY_USB_TYPE_DCP;
> +	else /* SDP_CHARGER_BIT (or others) */
> +		*val = POWER_SUPPLY_USB_TYPE_SDP;
> +
> +	return 0;
> +}
> +
> +int smb2_get_prop_status(struct smb2_chip *chip, int *val)

static int

> +{
> +	int usb_online_val;
> +	unsigned char stat[2];
> +	int rc;
> +
> +	rc = smb2_get_prop_usb_online(chip, &usb_online_val);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't get usb online property rc = %d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	if (!usb_online_val) {
> +		*val = POWER_SUPPLY_STATUS_DISCHARGING;
> +		return rc;
> +	}
> +
> +	rc = regmap_bulk_read(chip->regmap,
> +			      chip->base + BATTERY_CHARGER_STATUS_1, &stat, 2);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Failed to read charging status ret=%d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	if (stat[1] & CHARGER_ERROR_STATUS_BAT_OV_BIT) {
> +		*val = POWER_SUPPLY_STATUS_NOT_CHARGING;
> +		return 0;
> +	}
> +
> +	stat[0] = stat[0] & BATTERY_CHARGER_STATUS_MASK;
> +
> +	switch (stat[0]) {
> +	case TRICKLE_CHARGE:
> +	case PRE_CHARGE:
> +	case FAST_CHARGE:
> +	case FULLON_CHARGE:
> +	case TAPER_CHARGE:
> +		*val = POWER_SUPPLY_STATUS_CHARGING;
> +		return rc;
> +	case DISABLE_CHARGE:
> +		*val = POWER_SUPPLY_STATUS_NOT_CHARGING;
> +		return rc;
> +	case TERMINATE_CHARGE:
> +		*val = POWER_SUPPLY_STATUS_FULL;
> +		return rc;
> +	case INHIBIT_CHARGE:
> +	default:
> +		*val = POWER_SUPPLY_STATUS_UNKNOWN;
> +		return rc;
> +	}
> +}
> +
> +static inline int smb2_get_current_limit(struct smb2_chip *chip,
> +					 unsigned int *val)
> +{
> +	int rc = regmap_read(chip->regmap, chip->base + ICL_STATUS, val);
> +
> +	if (rc >= 0)
> +		*val *= 25000;
> +	return rc;
> +}
> +
> +static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int val)
> +{
> +	unsigned char val_raw;
> +
> +	if (val > 4800000) {
> +		dev_err(chip->dev,
> +			"Can't set current limit higher than 4800000uA");
> +		return -EINVAL;
> +	}
> +	val_raw = val / 25000;
> +
> +	return regmap_write(chip->regmap, chip->base + USBIN_CURRENT_LIMIT_CFG,
> +			    val_raw);
> +}
> +
> +void smb2_status_change_work(struct work_struct *work)
> +{
> +	struct smb2_chip *chip =
> +		container_of(work, struct smb2_chip, status_change_work.work);
> +	unsigned int charger_type, current_ua;
> +	int usb_online, count, rc;
> +
> +	smb2_get_prop_usb_online(chip, &usb_online);
> +	if (usb_online == 0) {
> +		chip->default_curr_limit = 0;
> +		return;
> +	}
> +
> +	for (count = 0; count < 3; count++) {
> +		dev_dbg(chip->dev, "get charger type retry %d\n", count);
> +		rc = smb2_apsd_get_charger_type(chip, &charger_type);
> +		if (rc == 0)
> +			break;
> +		msleep(100);
> +	}
> +
> +	if (rc < 0) {
> +		rc = regmap_update_bits(chip->regmap, chip->base + CMD_APSD,
> +					APSD_RERUN_BIT, APSD_RERUN_BIT);
> +		schedule_delayed_work(&chip->status_change_work,
> +				      msecs_to_jiffies(1500));
> +		dev_dbg(chip->dev, "get charger type failed, rerun apsd\n");
> +		return;
> +	}
> +
> +	switch (charger_type) {
> +	case POWER_SUPPLY_USB_TYPE_CDP:
> +		current_ua = CDP_CURRENT_UA;
> +		break;
> +	case POWER_SUPPLY_USB_TYPE_DCP:
> +		current_ua = DCP_CURRENT_UA;
> +		break;
> +	case POWER_SUPPLY_USB_TYPE_SDP:
> +	default:
> +		current_ua = SDP_CURRENT_UA;
> +		break;
> +	}
> +
> +	chip->default_curr_limit = current_ua;
> +
> +	smb2_set_current_limit(chip, current_ua);
> +	power_supply_changed(chip->chg_psy);
> +}
> +
> +int smb2_get_iio_chan(struct smb2_chip *chip, struct iio_channel *chan,
> +		      int *val)

static int

> +{
> +	int rc;
> +	union power_supply_propval status;
> +
> +	rc = power_supply_get_property(chip->chg_psy, POWER_SUPPLY_PROP_STATUS,
> +				       &status);
> +	if (rc < 0 || status.intval != POWER_SUPPLY_STATUS_CHARGING) {
> +		*val = 0;
> +		return 0;
> +	}
> +
> +	if (IS_ERR(chan)) {
> +		dev_err(chip->dev, "Failed to chan, err = %li", PTR_ERR(chan));
> +		return PTR_ERR(chan);
> +	}
> +
> +	return iio_read_channel_processed(chan, val);
> +}
> +
> +int smb2_get_prop_health(struct smb2_chip *chip, int *val)

static int

> +{
> +	int rc;
> +	unsigned int stat;
> +
> +	rc = regmap_read(chip->regmap, chip->base + BATTERY_CHARGER_STATUS_2,
> +			 &stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't read charger status rc=%d\n", rc);
> +		return rc;
> +	}
> +
> +	switch (stat) {
> +	case CHARGER_ERROR_STATUS_BAT_OV_BIT:
> +		*val = POWER_SUPPLY_HEALTH_OVERVOLTAGE;
> +		return 0;
> +	case BAT_TEMP_STATUS_TOO_COLD_BIT:
> +		*val = POWER_SUPPLY_HEALTH_COLD;
> +		return 0;
> +	case BAT_TEMP_STATUS_TOO_HOT_BIT:
> +		*val = POWER_SUPPLY_HEALTH_OVERHEAT;
> +		return 0;
> +	case BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT:
> +		*val = POWER_SUPPLY_HEALTH_COOL;
> +		return 0;
> +	case BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT:
> +		*val = POWER_SUPPLY_HEALTH_WARM;
> +		return 0;
> +	default:
> +		*val = POWER_SUPPLY_HEALTH_GOOD;
> +		return 0;
> +	}
> +}
> +
> +static int smb2_get_property(struct power_supply *psy,
> +			     enum power_supply_property psp,
> +			     union power_supply_propval *val)
> +{
> +	struct smb2_chip *chip = power_supply_get_drvdata(psy);
> +
> +	switch (psp) {
> +	case POWER_SUPPLY_PROP_MANUFACTURER:
> +		val->strval = "Qualcomm";
> +		return 0;
> +	case POWER_SUPPLY_PROP_MODEL_NAME:
> +		val->strval = chip->name;
> +		return 0;
> +	case POWER_SUPPLY_PROP_CURRENT_MAX:
> +	case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
> +		return smb2_get_current_limit(chip, &val->intval);
> +	case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
> +		val->intval = chip->default_curr_limit;
> +		return 0;
> +	case POWER_SUPPLY_PROP_CURRENT_NOW:
> +		return smb2_get_iio_chan(chip, chip->usb_in_i_chan,
> +					 &val->intval);
> +	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
> +		return smb2_get_iio_chan(chip, chip->usb_in_v_chan,
> +					 &val->intval);
> +	case POWER_SUPPLY_PROP_ONLINE:
> +		return smb2_get_prop_usb_online(chip, &val->intval);
> +	case POWER_SUPPLY_PROP_STATUS:
> +		return smb2_get_prop_status(chip, &val->intval);
> +	case POWER_SUPPLY_PROP_HEALTH:
> +		return smb2_get_prop_health(chip, &val->intval);
> +	case POWER_SUPPLY_PROP_USB_TYPE:
> +		return smb2_apsd_get_charger_type(chip, &val->intval);
> +	default:
> +		dev_err(chip->dev, "invalid property: %d\n", psp);
> +		return -EINVAL;
> +	}
> +}
> +
> +static int smb2_set_property(struct power_supply *psy,
> +			     enum power_supply_property psp,
> +			     const union power_supply_propval *val)
> +{
> +	struct smb2_chip *chip = power_supply_get_drvdata(psy);
> +
> +	switch (psp) {
> +	case POWER_SUPPLY_PROP_CURRENT_MAX:
> +	case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
> +		return smb2_set_current_limit(chip, val->intval);
> +	default:
> +		dev_err(chip->dev, "No setter for property: %d\n", psp);
> +		return -EINVAL;
> +	}
> +}
> +
> +static int smb2_property_is_writable(struct power_supply *psy,
> +				     enum power_supply_property psp)
> +{
> +	switch (psp) {
> +	case POWER_SUPPLY_PROP_CURRENT_MAX:
> +	case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
> +		return 1;
> +	default:
> +		return 0;
> +	}
> +}
> +
> +irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data)
> +{
> +	struct smb2_chip *chip = data;
> +	unsigned int status;
> +
> +	regmap_read(chip->regmap, chip->base + BATTERY_CHARGER_STATUS_2,
> +		    &status);
> +
> +	if (status & CHARGER_ERROR_STATUS_BAT_OV_BIT) {
> +		/* The hardware stops charging automatically */
> +		dev_err(chip->dev,
> +			"battery overvoltage detected, charging stopped\n");
> +		power_supply_changed(chip->chg_psy);
> +	}
> +
> +	return IRQ_HANDLED;
> +}
> +
> +irqreturn_t smb2_handle_usb_plugin(int irq, void *data)
> +{
> +	struct smb2_chip *chip = data;
> +
> +	power_supply_changed(chip->chg_psy);
> +
> +	schedule_delayed_work(&chip->status_change_work,
> +			      msecs_to_jiffies(1000));
> +
> +	return IRQ_HANDLED;
> +}
> +
> +irqreturn_t smb2_handle_usb_icl_change(int irq, void *data)
> +{
> +	struct smb2_chip *chip = data;
> +
> +	power_supply_changed(chip->chg_psy);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +irqreturn_t smb2_handle_wdog_bark(int irq, void *data)
> +{
> +	struct smb2_chip *chip = data;
> +	int rc;
> +
> +	power_supply_changed(chip->chg_psy);
> +
> +	rc = regmap_write(chip->regmap, BARK_BITE_WDOG_PET,
> +			  BARK_BITE_WDOG_PET_BIT);
> +	if (rc < 0)
> +		dev_err(chip->dev, "Couldn't pet the dog rc=%d\n", rc);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +static const struct power_supply_desc smb2_psy_desc = {
> +	.name = "pmi8998_charger",
> +	.type = POWER_SUPPLY_TYPE_USB,
> +	.usb_types = smb2_usb_types,
> +	.num_usb_types = ARRAY_SIZE(smb2_usb_types),
> +	.properties = smb2_properties,
> +	.num_properties = ARRAY_SIZE(smb2_properties),
> +	.get_property = smb2_get_property,
> +	.set_property = smb2_set_property,
> +	.property_is_writeable = smb2_property_is_writable,
> +};
> +
> +/* Init sequence derived from vendor downstream driver */
> +static const struct smb2_register smb2_init_seq[] = {
> +	{ .addr = AICL_RERUN_TIME_CFG, .mask = AICL_RERUN_TIME_MASK, .val = 0 },
> +	/*
> +	 * By default configure us as an upstream facing port
> +	 * FIXME: for OTG we should set UFP_EN_CMD_BIT and DFP_EN_CMD_BIT both to 0

I suppose OTG is disabled by default, so why is this tagged FIXME?

> +	 */
> +	{ .addr = TYPE_C_INTRPT_ENB_SOFTWARE_CTRL,
> +	  .mask = TYPEC_POWER_ROLE_CMD_MASK | VCONN_EN_SRC_BIT |
> +		  VCONN_EN_VALUE_BIT,
> +	  .val = VCONN_EN_SRC_BIT | UFP_EN_CMD_BIT },
> +	/*
> +	 * disable Type-C factory mode and stay in Attached.SRC state when VCONN
> +	 * over-current happens
> +	 */
> +	{ .addr = TYPE_C_CFG,
> +	  .mask = FACTORY_MODE_DETECTION_EN_BIT | VCONN_OC_CFG_BIT,
> +	  .val = 0 },
> +	/* Configure VBUS for software control */
> +	{ .addr = OTG_CFG, .mask = OTG_EN_SRC_CFG_BIT, .val = 0 },
> +	{ .addr = FG_UPDATE_CFG_2_SEL,
> +	  .mask = SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT |
> +		  VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT,
> +	  .val = VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT },
> +	/* Enable charging */
> +	{ .addr = USBIN_OPTIONS_1_CFG, .mask = HVDCP_EN_BIT, .val = 0 },
> +	{ .addr = CHARGING_ENABLE_CMD,
> +	  .mask = CHARGING_ENABLE_CMD_BIT,
> +	  .val = CHARGING_ENABLE_CMD_BIT },
> +	/* Allow overriding the current limit */
> +	// { .addr = USBIN_LOAD_CFG,
> +	//   .mask = ICL_OVERRIDE_AFTER_APSD_BIT,
> +	//   .val = ICL_OVERRIDE_AFTER_APSD_BIT },

Can this just be removed?

> +	{ .addr = CHGR_CFG2,
> +	  .mask = CHG_EN_SRC_BIT | CHG_EN_POLARITY_BIT |
> +		  PRETOFAST_TRANSITION_CFG_BIT | BAT_OV_ECC_BIT | I_TERM_BIT |
> +		  AUTO_RECHG_BIT | EN_ANALOG_DROP_IN_VBATT_BIT |
> +		  CHARGER_INHIBIT_BIT,
> +	  .val = 0 },
> +	/*
> +	 * No clue what this does
> +	 */
> +	{ .addr = STAT_CFG,
> +	  .mask = STAT_SW_OVERRIDE_CFG_BIT,
> +	  .val = STAT_SW_OVERRIDE_CFG_BIT },
> +	/*
> +	 * Set the default SDP charger type to a 500ma USB 2.0 port
> +	 */
> +	{ .addr = USBIN_ICL_OPTIONS,
> +	  .mask = USB51_MODE_BIT | USBIN_MODE_CHG_BIT,
> +	  .val = USB51_MODE_BIT },
> +	/*
> +	 * Disable watchdog
> +	 */
> +	{ .addr = SNARL_BARK_BITE_WD_CFG, .mask = 0xff, .val = 0 },
> +	{ .addr = WD_CFG,
> +	  .mask = WATCHDOG_TRIGGER_AFP_EN_BIT | WDOG_TIMER_EN_ON_PLUGIN_BIT |
> +		  BARK_WDOG_INT_EN_BIT,
> +	  .val = 0 },
> +	/* OnePlus init stuff from "op_set_collapse_fet" */
> +	{ .addr = USBIN_5V_AICL_THRESHOLD_CFG,
> +	  .mask = USBIN_5V_AICL_THRESHOLD_CFG_MASK,
> +	  .val = 0x3 },
> +	{ .addr = USBIN_CONT_AICL_THRESHOLD_CFG,
> +	  .mask = USBIN_CONT_AICL_THRESHOLD_CFG_MASK,
> +	  .val = 0x3 },
> +	/* Yay undocumented register values! */
> +	{ .addr = USBIN_LOAD_CFG, .mask = BIT(0) | BIT(1), .val = 0x3 },
> +	/* Enable Automatic Input Current Limit, this will slowly ramp up the current
> +	 * When connected to a wall charger, and automatically stop when it detects
> +	 * the charger current limit (voltage drop?) or it reaches the programmed limit.
> +	 */
> +	{ .addr = USBIN_AICL_OPTIONS_CFG,
> +	  .mask = USBIN_AICL_START_AT_MAX_BIT | USBIN_AICL_ADC_EN_BIT |
> +		  USBIN_AICL_EN_BIT | SUSPEND_ON_COLLAPSE_USBIN_BIT |
> +		  USBIN_HV_COLLAPSE_RESPONSE_BIT |
> +		  USBIN_LV_COLLAPSE_RESPONSE_BIT,
> +	  .val = USBIN_HV_COLLAPSE_RESPONSE_BIT |
> +		 USBIN_LV_COLLAPSE_RESPONSE_BIT | USBIN_AICL_EN_BIT },
> +	/*
> +	 * Set pre charge current to default, the OnePlus 6 bootloader
> +	 * sets this very conservatively.
> +	 * NOTE: seems to be reset to zero again anyway after boot
> +	 */
> +	{ .addr = PRE_CHARGE_CURRENT_CFG,
> +	  .mask = PRE_CHARGE_CURRENT_SETTING_MASK,
> +	  .val = 500000 / 25000 },
> +	/*
> +	 * Set "fast charge current" to the default 2A, the OnePlus 6 also
> +	 * sets this very conservatively.
> +	 * NOTE: seems to be reset to zero again anyway after boot
> +	 */
> +	{ .addr = FAST_CHARGE_CURRENT_CFG,
> +	  .mask = FAST_CHARGE_CURRENT_SETTING_MASK,
> +	  .addr = 1950000 / 25000 },
> +};
> +
> +static int smb2_init_hw(struct smb2_chip *chip)
> +{
> +	int rc, i;
> +
> +	for (i = 0; i < ARRAY_SIZE(smb2_init_seq); i++) {
> +		dev_dbg(chip->dev, "%d: Writing 0x%02x to 0x%02x\n", i,
> +			smb2_init_seq[i].val, smb2_init_seq[i].addr);
> +		rc = regmap_update_bits(chip->regmap,
> +					chip->base + smb2_init_seq[i].addr,
> +					smb2_init_seq[i].mask,
> +					smb2_init_seq[i].val);
> +		if (rc < 0)
> +			return dev_err_probe(
> +				chip->dev, rc,
> +				"%s: Failed to write 0x%02x to 0x%02x\n",
> +				__func__, smb2_init_seq[i].val,
> +				smb2_init_seq[i].addr);
> +	}
> +
> +	return 0;
> +}
> +
> +struct smb2_irqs {
> +	const char *name;
> +	irqreturn_t (*handler)(int irq, void *data);
> +};
> +
> +static const struct smb2_irqs irqs[] = {
> +	{ .name = "bat-ov", .handler = smb2_handle_batt_overvoltage },
> +	{ .name = "usb-plugin", .handler = smb2_handle_usb_plugin },
> +	{ .name = "usbin-icl-change", .handler = smb2_handle_usb_icl_change },
> +	{ .name = "wdog-bark", .handler = smb2_handle_wdog_bark },
> +};
> +
> +static int smb2_probe(struct platform_device *pdev)
> +{
> +	struct power_supply_config supply_config = {};
> +	struct smb2_chip *chip;
> +	int rc, i, irq;
> +
> +	chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
> +	if (!chip)
> +		return -ENOMEM;
> +
> +	chip->dev = &pdev->dev;
> +	chip->name = pdev->name;
> +
> +	chip->regmap = dev_get_regmap(pdev->dev.parent, NULL);
> +	if (!chip->regmap) {
> +		return dev_err_probe(chip->dev, -ENODEV,
> +				     "failed to locate the regmap\n");
> +	}
> +
> +	rc = device_property_read_u32(chip->dev, "reg", &chip->base);
> +	if (rc < 0) {
> +		return dev_err_probe(chip->dev, rc,
> +				     "Couldn't read base address\n");
> +	}
> +
> +	chip->usb_in_v_chan = devm_iio_channel_get(chip->dev, "usbin_v");
> +	if (IS_ERR(chip->usb_in_v_chan))
> +		return dev_err_probe(
> +			chip->dev, PTR_ERR(chip->usb_in_v_chan),
> +			"Couldn't get usbin_v IIO channel from RRADC\n");
> +
> +	chip->usb_in_i_chan = devm_iio_channel_get(chip->dev, "usbin_i");
> +	if (IS_ERR(chip->usb_in_i_chan)) {
> +		return dev_err_probe(
> +			chip->dev, PTR_ERR(chip->usb_in_i_chan),
> +			"Couldn't get usbin_i IIO channel from RRADC\n");
> +	}
> +
> +	rc = smb2_init_hw(chip);
> +	if (rc < 0)
> +		return rc;
> +
> +	supply_config.drv_data = chip;
> +	supply_config.of_node = pdev->dev.of_node;
> +
> +	chip->chg_psy = devm_power_supply_register(chip->dev, &smb2_psy_desc,
> +						   &supply_config);
> +	if (IS_ERR(chip->chg_psy))
> +		return dev_err_probe(chip->dev, PTR_ERR(chip->chg_psy),
> +				     "failed to register power supply\n");
> +
> +	rc = power_supply_get_battery_info(chip->chg_psy, &chip->batt_info);
> +	if (rc)
> +		return dev_err_probe(chip->dev, rc,
> +				     "Failed to get battery info\n");
> +
> +	rc = devm_delayed_work_autocancel(chip->dev, &chip->status_change_work,
> +					  smb2_status_change_work);
> +	if (rc)
> +		return dev_err_probe(
> +			chip->dev, rc,
> +			"Failed to initialise status change work\n");
> +
> +	rc = (chip->batt_info->voltage_max_design_uv - 3487500) / 7500 + 1;
> +	rc = regmap_update_bits(chip->regmap, chip->base + FLOAT_VOLTAGE_CFG,
> +				FLOAT_VOLTAGE_SETTING_MASK, rc);
> +	if (rc < 0)
> +		return dev_err_probe(chip->dev, rc, "Couldn't set vbat max\n");
> +
> +	for (i = 0; i < ARRAY_SIZE(irqs); i++) {
> +		irq = of_irq_get_byname(pdev->dev.of_node, irqs[i].name);
> +		if (irq < 0)
> +			return dev_err_probe(chip->dev, irq,
> +					     "Couldn't get irq %s byname\n",
> +					     irqs[i].name);
> +		rc = devm_request_threaded_irq(chip->dev, irq, NULL,
> +					       irqs[i].handler, IRQF_ONESHOT,
> +					       irqs[i].name, chip);
> +		if (rc < 0)
> +			return dev_err_probe(chip->dev, irq,

irq -> rc (I already provided that comment in v3 :()

> +					     "Couldn't request irq %s\n",
> +					     irqs[i].name);
> +	}
> +
> +	platform_set_drvdata(pdev, chip);
> +
> +	/* Initialise charger state */
> +	schedule_delayed_work(&chip->status_change_work, 0);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id smb2_match_id_table[] = {
> +	{ .compatible = "qcom,pmi8998-charger" },
> +	{ .compatible = "qcom,pm660-charger" },
> +	{ /* sentinal */ }
> +};
> +MODULE_DEVICE_TABLE(of, smb2_match_id_table);
> +
> +static struct platform_driver qcom_spmi_smb2 = {
> +	.probe = smb2_probe,
> +	.driver = {
> +			.name = "qcom-pmi8998-charger",
> +			.of_match_table = smb2_match_id_table,
> +		},
> +};
> +
> +module_platform_driver(qcom_spmi_smb2);
> +
> +MODULE_AUTHOR("Caleb Connolly <caleb.connolly@linaro.org>");
> +MODULE_DESCRIPTION("Qualcomm SMB2 Charger Driver");
> +MODULE_LICENSE("GPL");

(and the missing 'static' keyword for private functions that the
bot found of course)

-- Sebastian

On 06/07/2022 20:41, Caleb Connolly wrote:
> Add a driver for the SMB2 charger block found in the Qualcomm PMI8998
> and PM660.

I noticed an issue in this revision which was the root-cause of the OnePlus 6 charging incredibly 
slowly. Other SDM845 phones feature a secondary charger IC, usually the smb1135 (iirc) which was 
able to work normally, hiding the issue, however the OnePlus 6 does not. See below.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> Changes since v1:
>   * Renamed from qcom_smb2 to qcom_pmi8998_charger
> ---
>   drivers/power/supply/Kconfig                |    9 +
>   drivers/power/supply/Makefile               |    1 +
>   drivers/power/supply/qcom_pmi8998_charger.c | 1044 +++++++++++++++++++
>   3 files changed, 1054 insertions(+)
>   create mode 100644 drivers/power/supply/qcom_pmi8998_charger.c
> 
> diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
> index 7f02f36aea55..a39e3eda6dbd 100644

[snip]

> +
> +/* Init sequence derived from vendor downstream driver */
> +static const struct smb2_register smb2_init_seq[] = {
> +	{ .addr = AICL_RERUN_TIME_CFG, .mask = AICL_RERUN_TIME_MASK, .val = 0 },
> +	/*
> +	 * By default configure us as an upstream facing port
> +	 * FIXME: for OTG we should set UFP_EN_CMD_BIT and DFP_EN_CMD_BIT both to 0
> +	 */
> +	{ .addr = TYPE_C_INTRPT_ENB_SOFTWARE_CTRL,
> +	  .mask = TYPEC_POWER_ROLE_CMD_MASK | VCONN_EN_SRC_BIT |
> +		  VCONN_EN_VALUE_BIT,
> +	  .val = VCONN_EN_SRC_BIT | UFP_EN_CMD_BIT },
> +	/*
> +	 * disable Type-C factory mode and stay in Attached.SRC state when VCONN
> +	 * over-current happens
> +	 */
> +	{ .addr = TYPE_C_CFG,
> +	  .mask = FACTORY_MODE_DETECTION_EN_BIT | VCONN_OC_CFG_BIT,
> +	  .val = 0 },
> +	/* Configure VBUS for software control */
> +	{ .addr = OTG_CFG, .mask = OTG_EN_SRC_CFG_BIT, .val = 0 },
> +	{ .addr = FG_UPDATE_CFG_2_SEL,
> +	  .mask = SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT |
> +		  VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT,
> +	  .val = VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT },
> +	/* Enable charging */
> +	{ .addr = USBIN_OPTIONS_1_CFG, .mask = HVDCP_EN_BIT, .val = 0 },
> +	{ .addr = CHARGING_ENABLE_CMD,
> +	  .mask = CHARGING_ENABLE_CMD_BIT,
> +	  .val = CHARGING_ENABLE_CMD_BIT },
> +	/* Allow overriding the current limit */
> +	// { .addr = USBIN_LOAD_CFG,
> +	//   .mask = ICL_OVERRIDE_AFTER_APSD_BIT,
> +	//   .val = ICL_OVERRIDE_AFTER_APSD_BIT },
> +	{ .addr = CHGR_CFG2,
> +	  .mask = CHG_EN_SRC_BIT | CHG_EN_POLARITY_BIT |
> +		  PRETOFAST_TRANSITION_CFG_BIT | BAT_OV_ECC_BIT | I_TERM_BIT |
> +		  AUTO_RECHG_BIT | EN_ANALOG_DROP_IN_VBATT_BIT |
> +		  CHARGER_INHIBIT_BIT,
> +	  .val = 0 },
> +	/*
> +	 * No clue what this does
> +	 */
> +	{ .addr = STAT_CFG,
> +	  .mask = STAT_SW_OVERRIDE_CFG_BIT,
> +	  .val = STAT_SW_OVERRIDE_CFG_BIT },
> +	/*
> +	 * Set the default SDP charger type to a 500ma USB 2.0 port
> +	 */
> +	{ .addr = USBIN_ICL_OPTIONS,
> +	  .mask = USB51_MODE_BIT | USBIN_MODE_CHG_BIT,
> +	  .val = USB51_MODE_BIT },
> +	/*
> +	 * Disable watchdog
> +	 */
> +	{ .addr = SNARL_BARK_BITE_WD_CFG, .mask = 0xff, .val = 0 },
> +	{ .addr = WD_CFG,
> +	  .mask = WATCHDOG_TRIGGER_AFP_EN_BIT | WDOG_TIMER_EN_ON_PLUGIN_BIT |
> +		  BARK_WDOG_INT_EN_BIT,
> +	  .val = 0 },
> +	/* OnePlus init stuff from "op_set_collapse_fet" */
> +	{ .addr = USBIN_5V_AICL_THRESHOLD_CFG,
> +	  .mask = USBIN_5V_AICL_THRESHOLD_CFG_MASK,
> +	  .val = 0x3 },
> +	{ .addr = USBIN_CONT_AICL_THRESHOLD_CFG,
> +	  .mask = USBIN_CONT_AICL_THRESHOLD_CFG_MASK,
> +	  .val = 0x3 },
> +	/* Yay undocumented register values! */
> +	{ .addr = USBIN_LOAD_CFG, .mask = BIT(0) | BIT(1), .val = 0x3 },
> +	/* Enable Automatic Input Current Limit, this will slowly ramp up the current
> +	 * When connected to a wall charger, and automatically stop when it detects
> +	 * the charger current limit (voltage drop?) or it reaches the programmed limit.
> +	 */
> +	{ .addr = USBIN_AICL_OPTIONS_CFG,
> +	  .mask = USBIN_AICL_START_AT_MAX_BIT | USBIN_AICL_ADC_EN_BIT |
> +		  USBIN_AICL_EN_BIT | SUSPEND_ON_COLLAPSE_USBIN_BIT |
> +		  USBIN_HV_COLLAPSE_RESPONSE_BIT |
> +		  USBIN_LV_COLLAPSE_RESPONSE_BIT,
> +	  .val = USBIN_HV_COLLAPSE_RESPONSE_BIT |
> +		 USBIN_LV_COLLAPSE_RESPONSE_BIT | USBIN_AICL_EN_BIT },
> +	/*
> +	 * Set pre charge current to default, the OnePlus 6 bootloader
> +	 * sets this very conservatively.
> +	 * NOTE: seems to be reset to zero again anyway after boot
> +	 */
> +	{ .addr = PRE_CHARGE_CURRENT_CFG,
> +	  .mask = PRE_CHARGE_CURRENT_SETTING_MASK,
> +	  .val = 500000 / 25000 },
> +	/*
> +	 * Set "fast charge current" to the default 2A, the OnePlus 6 also
> +	 * sets this very conservatively.
> +	 * NOTE: seems to be reset to zero again anyway after boot
> +	 */
> +	{ .addr = FAST_CHARGE_CURRENT_CFG,
> +	  .mask = FAST_CHARGE_CURRENT_SETTING_MASK,
> +	  .addr = 1950000 / 25000 },

The .addr is set here twice, meaning the fast charge current register is not configured properly and 
thus left at conservative bootloader values - or set to zero, I'm not sure how the compiler handles 
this.

Will be fixed in the next revision.
> +};
> +
> +static int smb2_init_hw(struct smb2_chip *chip)
> +{
> +	int rc, i;
> +
> +	for (i = 0; i < ARRAY_SIZE(smb2_init_seq); i++) {
> +		dev_dbg(chip->dev, "%d: Writing 0x%02x to 0x%02x\n", i,
> +			smb2_init_seq[i].val, smb2_init_seq[i].addr);
> +		rc = regmap_update_bits(chip->regmap,
> +					chip->base + smb2_init_seq[i].addr,
> +					smb2_init_seq[i].mask,
> +					smb2_init_seq[i].val);
> +		if (rc < 0)
> +			return dev_err_probe(
> +				chip->dev, rc,
> +				"%s: Failed to write 0x%02x to 0x%02x\n",
> +				__func__, smb2_init_seq[i].val,
> +				smb2_init_seq[i].addr);
> +	}
> +
> +	return 0;
> +}
> +
> +struct smb2_irqs {
> +	const char *name;
> +	irqreturn_t (*handler)(int irq, void *data);
> +};
> +
> +static const struct smb2_irqs irqs[] = {
> +	{ .name = "bat-ov", .handler = smb2_handle_batt_overvoltage },
> +	{ .name = "usb-plugin", .handler = smb2_handle_usb_plugin },
> +	{ .name = "usbin-icl-change", .handler = smb2_handle_usb_icl_change },
> +	{ .name = "wdog-bark", .handler = smb2_handle_wdog_bark },
> +};
> +
> +static int smb2_probe(struct platform_device *pdev)
> +{
> +	struct power_supply_config supply_config = {};
> +	struct smb2_chip *chip;
> +	int rc, i, irq;
> +
> +	chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
> +	if (!chip)
> +		return -ENOMEM;
> +
> +	chip->dev = &pdev->dev;
> +	chip->name = pdev->name;
> +
> +	chip->regmap = dev_get_regmap(pdev->dev.parent, NULL);
> +	if (!chip->regmap) {
> +		return dev_err_probe(chip->dev, -ENODEV,
> +				     "failed to locate the regmap\n");
> +	}
> +
> +	rc = device_property_read_u32(chip->dev, "reg", &chip->base);
> +	if (rc < 0) {
> +		return dev_err_probe(chip->dev, rc,
> +				     "Couldn't read base address\n");
> +	}
> +
> +	chip->usb_in_v_chan = devm_iio_channel_get(chip->dev, "usbin_v");
> +	if (IS_ERR(chip->usb_in_v_chan))
> +		return dev_err_probe(
> +			chip->dev, PTR_ERR(chip->usb_in_v_chan),
> +			"Couldn't get usbin_v IIO channel from RRADC\n");
> +
> +	chip->usb_in_i_chan = devm_iio_channel_get(chip->dev, "usbin_i");
> +	if (IS_ERR(chip->usb_in_i_chan)) {
> +		return dev_err_probe(
> +			chip->dev, PTR_ERR(chip->usb_in_i_chan),
> +			"Couldn't get usbin_i IIO channel from RRADC\n");
> +	}
> +
> +	rc = smb2_init_hw(chip);
> +	if (rc < 0)
> +		return rc;
> +
> +	supply_config.drv_data = chip;
> +	supply_config.of_node = pdev->dev.of_node;
> +
> +	chip->chg_psy = devm_power_supply_register(chip->dev, &smb2_psy_desc,
> +						   &supply_config);
> +	if (IS_ERR(chip->chg_psy))
> +		return dev_err_probe(chip->dev, PTR_ERR(chip->chg_psy),
> +				     "failed to register power supply\n");
> +
> +	rc = power_supply_get_battery_info(chip->chg_psy, &chip->batt_info);
> +	if (rc)
> +		return dev_err_probe(chip->dev, rc,
> +				     "Failed to get battery info\n");
> +
> +	rc = devm_delayed_work_autocancel(chip->dev, &chip->status_change_work,
> +					  smb2_status_change_work);
> +	if (rc)
> +		return dev_err_probe(
> +			chip->dev, rc,
> +			"Failed to initialise status change work\n");
> +
> +	rc = (chip->batt_info->voltage_max_design_uv - 3487500) / 7500 + 1;
> +	rc = regmap_update_bits(chip->regmap, chip->base + FLOAT_VOLTAGE_CFG,
> +				FLOAT_VOLTAGE_SETTING_MASK, rc);
> +	if (rc < 0)
> +		return dev_err_probe(chip->dev, rc, "Couldn't set vbat max\n");
> +
> +	for (i = 0; i < ARRAY_SIZE(irqs); i++) {
> +		irq = of_irq_get_byname(pdev->dev.of_node, irqs[i].name);
> +		if (irq < 0)
> +			return dev_err_probe(chip->dev, irq,
> +					     "Couldn't get irq %s byname\n",
> +					     irqs[i].name);
> +		rc = devm_request_threaded_irq(chip->dev, irq, NULL,
> +					       irqs[i].handler, IRQF_ONESHOT,
> +					       irqs[i].name, chip);
> +		if (rc < 0)
> +			return dev_err_probe(chip->dev, irq,
> +					     "Couldn't request irq %s\n",
> +					     irqs[i].name);
> +	}
> +
> +	platform_set_drvdata(pdev, chip);
> +
> +	/* Initialise charger state */
> +	schedule_delayed_work(&chip->status_change_work, 0);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id smb2_match_id_table[] = {
> +	{ .compatible = "qcom,pmi8998-charger" },
> +	{ .compatible = "qcom,pm660-charger" },
> +	{ /* sentinal */ }
> +};
> +MODULE_DEVICE_TABLE(of, smb2_match_id_table);
> +
> +static struct platform_driver qcom_spmi_smb2 = {
> +	.probe = smb2_probe,
> +	.driver = {
> +			.name = "qcom-pmi8998-charger",
> +			.of_match_table = smb2_match_id_table,
> +		},
> +};
> +
> +module_platform_driver(qcom_spmi_smb2);
> +
> +MODULE_AUTHOR("Caleb Connolly <caleb.connolly@linaro.org>");
> +MODULE_DESCRIPTION("Qualcomm SMB2 Charger Driver");
> +MODULE_LICENSE("GPL");