From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-arm-msm-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D544FCCA47D
	for <linux-arm-msm@archiver.kernel.org>; Thu,  9 Jun 2022 23:04:42 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1345854AbiFIXEl (ORCPT
        <rfc822;linux-arm-msm@archiver.kernel.org>);
        Thu, 9 Jun 2022 19:04:41 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55068 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234341AbiFIXEk (ORCPT
        <rfc822;linux-arm-msm@vger.kernel.org>);
        Thu, 9 Jun 2022 19:04:40 -0400
Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 675B13BD4D2;
        Thu,  9 Jun 2022 16:04:37 -0700 (PDT)
Received: from mercury (unknown [185.209.196.172])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
        (No client certificate requested)
        (Authenticated sender: sre)
        by madras.collabora.co.uk (Postfix) with ESMTPSA id ED9CC6601606;
        Fri, 10 Jun 2022 00:04:35 +0100 (BST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com;
        s=mail; t=1654815876;
        bh=EyCkdH/Jxan9e717EozlrWbgQtVHBrnViwQ0eQdFxLQ=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=UF10cJLsPlFn4gcU7BKnQxofwcXevHtAT6QoBBZy/xjZIJ35FA/KkHQde9tlyrwCm
         pOb/7Q0NpxYocbpF7VRPfkrQMMKeOJL3ipckloXOXLUlfbUZO8rr8ibrazTyFRbX6/
         hKu9YXNNz6ly+PIMK/LmPWGWtiPmVGWsSbook8LKi/Eknn6WXl0pZ2bN9f60xavOcJ
         XwKtdwzhNF0mfZs7EO56oN+kPmWJyjMiJqK7HOfZ/NvkesqZZMAPnWZtOFlNlXVTJf
         ZbNWBoBnD1yTm2sGSKBrhYYMqU0yvzmdaCOVACHs9ZbSTeA/dJcK/KdlE529074MPF
         G7Dpy+QPZgt9A==
Received: by mercury (Postfix, from userid 1000)
        id 40BF210605B9; Fri, 10 Jun 2022 01:04:33 +0200 (CEST)
Date:   Fri, 10 Jun 2022 01:04:33 +0200
From:   Sebastian Reichel <sebastian.reichel@collabora.com>
To:     Caleb Connolly <caleb.connolly@linaro.org>
Cc:     Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Andy Gross <agross@kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
        phone-devel@vger.kernel.org
Subject: Re: [PATCH v3 1/6] power: supply: add Qualcomm PMI8998 SMB2 Charger
 driver
Message-ID: <20220609230433.eu4aoodjzvd6vcao@mercury.elektranox.org>
References: <20220513200512.501156-1-caleb.connolly@linaro.org>
 <20220513200512.501156-2-caleb.connolly@linaro.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="2dn6ioxdq7jcbj5h"
Content-Disposition: inline
In-Reply-To: <20220513200512.501156-2-caleb.connolly@linaro.org>
Precedence: bulk
List-ID: <linux-arm-msm.vger.kernel.org>
X-Mailing-List: linux-arm-msm@vger.kernel.org


--2dn6ioxdq7jcbj5h
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

Looks mostly good to me, but I found some more things that need to
be fixed.

On Fri, May 13, 2022 at 09:05:07PM +0100, Caleb Connolly wrote:
> Add a driver for the SMB2 charger block found in the Qualcomm PMI8998
> and PM660.
>=20
> 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 | 1074 +++++++++++++++++++
>  3 files changed, 1084 insertions(+)
>  create mode 100644 drivers/power/supply/qcom_pmi8998_charger.c
>=20
> 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.
> =20
> +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)	+=3D acer_a500_batter=
y.o
>  obj-$(CONFIG_BATTERY_SURFACE)	+=3D surface_battery.o
>  obj-$(CONFIG_CHARGER_SURFACE)	+=3D surface_charger.o
>  obj-$(CONFIG_BATTERY_UG3105)	+=3D ug3105_battery.o
> +obj-$(CONFIG_CHARGER_QCOM_SMB2)	+=3D 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..6f82d9917d63
> --- /dev/null
> +++ b/drivers/power/supply/qcom_pmi8998_charger.c
> @@ -0,0 +1,1074 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
> + * Copyright (c) 2021, Linaro Ltd.
> + * 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>
> +
> +#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
> +
> +enum charger_status {
> +	TRICKLE_CHARGE =3D 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
> + */
> +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;
> +};
> +
> +static enum power_supply_property smb2_properties[] =3D {
> +	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,
> +};
> +
> +static enum power_supply_usb_type smb2_usb_types[] =3D {
> +	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)
> +{
> +	unsigned int stat;
> +	int rc;
> +
> +	rc =3D regmap_read(chip->regmap, chip->base + POWER_PATH_STATUS,
> +			 &stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't read POWER_PATH_STATUS! ret=3D%d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	*val =3D (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 =3D smb2_get_prop_usb_online(chip, &usb_online);
> +	if (rc < 0 || !usb_online) {
> +		*val =3D POWER_SUPPLY_USB_TYPE_UNKNOWN;
> +		return 0;
> +	}
> +
> +	rc =3D regmap_read(chip->regmap, chip->base + APSD_STATUS, &apsd_stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Failed to read apsd status, rc =3D %d", rc);
> +		return rc;
> +	}
> +	if (!(apsd_stat & APSD_DTC_STATUS_DONE_BIT)) {
> +		dev_err(chip->dev, "Apsd not ready");
> +		return -EAGAIN;
> +	}
> +
> +	rc =3D regmap_read(chip->regmap, chip->base + APSD_RESULT_STATUS, &stat=
);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Failed to read apsd result, rc =3D %d", rc);
> +		return rc;
> +	}
> +
> +	stat &=3D APSD_RESULT_STATUS_MASK;
> +
> +	if (stat & CDP_CHARGER_BIT)
> +		*val =3D POWER_SUPPLY_USB_TYPE_CDP;
> +	else if (stat & (DCP_CHARGER_BIT | OCP_CHARGER_BIT | FLOAT_CHARGER_BIT))
> +		*val =3D POWER_SUPPLY_USB_TYPE_DCP;
> +	else /* SDP_CHARGER_BIT (or others) */
> +		*val =3D POWER_SUPPLY_USB_TYPE_SDP;
> +
> +	return 0;
> +}
> +
> +int smb2_get_prop_status(struct smb2_chip *chip, int *val)
> +{
> +	int usb_online_val;
> +	unsigned char stat[2];
> +	int rc;
> +
> +	rc =3D smb2_get_prop_usb_online(chip, &usb_online_val);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't get usb online property rc =3D %d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	if (!usb_online_val) {
> +		*val =3D POWER_SUPPLY_STATUS_DISCHARGING;
> +		return rc;
> +	}
> +
> +	rc =3D 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=3D%d\n",
> +			rc);
> +		return rc;
> +	}
> +
> +	if (stat[1] & CHARGER_ERROR_STATUS_BAT_OV_BIT) {
> +		*val =3D POWER_SUPPLY_STATUS_NOT_CHARGING;
> +		return 0;
> +	}
> +
> +	stat[0] =3D 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 =3D POWER_SUPPLY_STATUS_CHARGING;
> +		return rc;
> +	case DISABLE_CHARGE:
> +		*val =3D POWER_SUPPLY_STATUS_NOT_CHARGING;
> +		return rc;
> +	case TERMINATE_CHARGE:
> +		*val =3D POWER_SUPPLY_STATUS_FULL;
> +		return rc;
> +	case INHIBIT_CHARGE:
> +	default:
> +		*val =3D POWER_SUPPLY_STATUS_UNKNOWN;
> +		return rc;
> +	}
> +}
> +
> +static inline int smb2_get_current_limit(struct smb2_chip *chip,
> +					 unsigned int *val)
> +{
> +	int rc =3D regmap_read(chip->regmap, chip->base + ICL_STATUS, val);
> +
> +	if (rc >=3D 0)
> +		*val *=3D 25000;
> +	return rc;
> +}
> +
> +static int smb2_set_current_limit(struct smb2_chip *chip, unsigned int v=
al)
> +{
> +	unsigned char val_raw, icl_option;
> +	unsigned int load_cfg;
> +	int rc;
> +
> +	if (val > 4800000) {
> +		dev_err(chip->dev,
> +			"Can't set current limit higher than 4800000uA");
> +		return -EINVAL;
> +	}
> +	val_raw =3D val / 25000;
> +
> +	if (val =3D=3D USBIN_CURRENT_100MA)
> +		icl_option =3D 0;
> +	else if (val =3D=3D USBIN_CURRENT_150MA)
> +		icl_option =3D CFG_USB3P0_SEL_BIT;
> +	else if (val =3D=3D USBIN_CURRENT_500MA)
> +		icl_option =3D USB51_MODE_BIT;
> +	else if (val =3D=3D USBIN_CURRENT_900MA)
> +		icl_option =3D CFG_USB3P0_SEL_BIT | USB51_MODE_BIT;
> +	else if (val > USBIN_CURRENT_500MA)
> +		icl_option =3D USBIN_MODE_CHG_BIT;

this does not cover all options for val and then icl_option is
not initialized.

> +	rc =3D regmap_update_bits(chip->regmap, chip->base + USBIN_ICL_OPTIONS,
> +		CFG_USB3P0_SEL_BIT | USB51_MODE_BIT | USBIN_MODE_CHG_BIT,
> +		icl_option);
> +	if (rc < 0)
> +		return rc;
> +
> +	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 =3D
> +		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 =3D=3D 0)
> +		return;
> +
> +	for (count =3D 0; count < 3; count++) {
> +		dev_dbg(chip->dev, "get charger type retry %d\n", count);
> +		rc =3D smb2_apsd_get_charger_type(chip, &charger_type);
> +		if (rc =3D=3D 0)
> +			break;
> +		msleep(100);
> +	}
> +
> +	if (rc < 0) {
> +		rc =3D 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 =3D CDP_CURRENT_UA;
> +		break;
> +	case POWER_SUPPLY_USB_TYPE_DCP:
> +		current_ua =3D DCP_CURRENT_UA;
> +		break;
> +	case POWER_SUPPLY_USB_TYPE_SDP:
> +	default:
> +		current_ua =3D SDP_CURRENT_UA;
> +		break;
> +	}
> +
> +	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)
> +{
> +	int rc;
> +	union power_supply_propval status;
> +
> +	rc =3D power_supply_get_property(chip->chg_psy, POWER_SUPPLY_PROP_STATU=
S,
> +				       &status);
> +	if (rc < 0 || status.intval !=3D POWER_SUPPLY_STATUS_CHARGING) {
> +		*val =3D 0;
> +		return 0;
> +	}
> +
> +	if (IS_ERR(chan)) {
> +		dev_err(chip->dev, "Failed to chan, err =3D %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)
> +{
> +	int rc;
> +	unsigned int stat;
> +
> +	*val =3D POWER_SUPPLY_HEALTH_UNKNOWN;

You can remove that. val is not used if an error is returned.

> +	rc =3D regmap_read(chip->regmap,
> +			 chip->base + BATTERY_CHARGER_STATUS_2, &stat);
> +	if (rc < 0) {
> +		dev_err(chip->dev, "Couldn't read charger status rc=3D%d\n", rc);
> +		return rc;
> +	}
> +
> +	switch (stat) {
> +	case CHARGER_ERROR_STATUS_BAT_OV_BIT:
> +		*val =3D POWER_SUPPLY_HEALTH_OVERVOLTAGE;
> +		return 0;
> +	case BAT_TEMP_STATUS_TOO_COLD_BIT:
> +		*val =3D POWER_SUPPLY_HEALTH_COLD;
> +		return 0;
> +	case BAT_TEMP_STATUS_TOO_HOT_BIT:
> +		*val =3D POWER_SUPPLY_HEALTH_OVERHEAT;
> +		return 0;
> +	case BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT:
> +		*val =3D POWER_SUPPLY_HEALTH_COOL;
> +		return 0;
> +	case BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT:
> +		*val =3D POWER_SUPPLY_HEALTH_WARM;
> +		return 0;
> +	default:
> +		*val =3D 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 =3D power_supply_get_drvdata(psy);
> +
> +	switch (psp) {
> +	case POWER_SUPPLY_PROP_MANUFACTURER:
> +		val->strval =3D "Qualcomm";
> +		return 0;
> +	case POWER_SUPPLY_PROP_MODEL_NAME:
> +		val->strval =3D chip->name;
> +		return 0;
> +	case POWER_SUPPLY_PROP_CURRENT_MAX:
> +		return smb2_get_current_limit(chip, &val->intval);
> +	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 =3D power_supply_get_drvdata(psy);
> +
> +	switch (psp) {
> +	case POWER_SUPPLY_PROP_CURRENT_MAX:
> +		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:
> +		return 1;
> +	default:
> +		return 0;
> +	}
> +}
> +
> +irqreturn_t smb2_handle_batt_overvoltage(int irq, void *data)
> +{
> +	struct smb2_chip *chip =3D 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 =3D 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 =3D data;
> +
> +	power_supply_changed(chip->chg_psy);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +irqreturn_t smb2_handle_wdog_bark(int irq, void *data)
> +{
> +	struct smb2_chip *chip =3D data;
> +	int rc;
> +
> +	power_supply_changed(chip->chg_psy);
> +
> +	rc =3D regmap_write(chip->regmap, BARK_BITE_WDOG_PET, BARK_BITE_WDOG_PE=
T_BIT);
> +	if (rc < 0)
> +		dev_err(chip->dev, "Couldn't pet the dog rc=3D%d\n", rc);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +static const struct power_supply_desc smb2_psy_desc =3D {
> +	.name =3D "pmi8998_charger",
> +	.type =3D POWER_SUPPLY_TYPE_USB,
> +	.usb_types =3D smb2_usb_types,
> +	.num_usb_types =3D ARRAY_SIZE(smb2_usb_types),
> +	.properties =3D smb2_properties,
> +	.num_properties =3D ARRAY_SIZE(smb2_properties),
> +	.get_property =3D smb2_get_property,
> +	.set_property =3D smb2_set_property,
> +	.property_is_writeable =3D smb2_property_is_writable,
> +};
> +
> +/* Init sequence derived from vendor downstream driver */
> +static const struct smb2_register smb2_init_seq[] =3D {
> +	{ .addr =3D AICL_RERUN_TIME_CFG,
> +	  .mask =3D AICL_RERUN_TIME_MASK,
> +	  .val =3D 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 =3D TYPE_C_INTRPT_ENB_SOFTWARE_CTRL,
> +	  .mask =3D TYPEC_POWER_ROLE_CMD_MASK | VCONN_EN_SRC_BIT
> +		| VCONN_EN_VALUE_BIT,
> +	  .val =3D 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 =3D TYPE_C_CFG,
> +	  .mask =3D FACTORY_MODE_DETECTION_EN_BIT | VCONN_OC_CFG_BIT,
> +	  .val =3D 0 },
> +	/* Configure VBUS for software control */
> +	{ .addr =3D OTG_CFG, .mask =3D OTG_EN_SRC_CFG_BIT, .val =3D 0 },
> +	{ .addr =3D FG_UPDATE_CFG_2_SEL,
> +	  .mask =3D SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT
> +		| VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT,
> +	  .val =3D VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT },
> +	/* Enable charging */
> +	{ .addr =3D USBIN_OPTIONS_1_CFG, .mask =3D HVDCP_EN_BIT, .val =3D 0 },
> +	{ .addr =3D CHARGING_ENABLE_CMD,
> +	  .mask =3D CHARGING_ENABLE_CMD_BIT,
> +	  .val =3D CHARGING_ENABLE_CMD_BIT },
> +	/* Allow overriding the current limit */
> +	{ .addr =3D USBIN_LOAD_CFG,
> +	  .mask =3D ICL_OVERRIDE_AFTER_APSD_BIT,
> +	  .val =3D ICL_OVERRIDE_AFTER_APSD_BIT },
> +	{ .addr =3D CHGR_CFG2,
> +	  .mask =3D 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 =3D 0 },
> +	/*
> +	 * No clue what this does
> +	 */
> +	{ .addr =3D STAT_CFG,
> +	  .mask =3D STAT_SW_OVERRIDE_CFG_BIT,
> +	  .val =3D STAT_SW_OVERRIDE_CFG_BIT },
> +	/*
> +	 * Set the default SDP charger type to a 500ma USB 2.0 port
> +	 */
> +	{ .addr =3D USBIN_ICL_OPTIONS,
> +	  .mask =3D USB51_MODE_BIT | USBIN_MODE_CHG_BIT,
> +	  .val =3D USB51_MODE_BIT },
> +	/*
> +	 * Disable watchdog
> +	 */
> +	{
> +	  .addr =3D SNARL_BARK_BITE_WD_CFG,
> +	  .mask =3D 0xff,
> +	  .val =3D 0 },
> +	{ .addr =3D WD_CFG,
> +	  .mask =3D WATCHDOG_TRIGGER_AFP_EN_BIT | WDOG_TIMER_EN_ON_PLUGIN_BIT
> +		| BARK_WDOG_INT_EN_BIT,
> +	  .val =3D 0 },
> +	/* OnePlus init stuff from "op_set_collapse_fet" */
> +	{ .addr =3D USBIN_5V_AICL_THRESHOLD_CFG,
> +	  .mask =3D USBIN_5V_AICL_THRESHOLD_CFG_MASK,
> +	  .val =3D 0x3 },
> +	{ .addr =3D USBIN_CONT_AICL_THRESHOLD_CFG,
> +	  .mask =3D USBIN_CONT_AICL_THRESHOLD_CFG_MASK,
> +	  .val =3D 0x3 },
> +	/* Yay undocumented register values! */
> +	{ .addr =3D USBIN_LOAD_CFG,
> +	  .mask =3D BIT(0) | BIT(1),
> +	  .val =3D 0x3 },
> +	/* Enable Automatic Input Current Limit, this will slowly ramp up the c=
urrent
> +	 * When connected to a wall charger, and automatically stop when it det=
ects
> +	 * the charger current limit (voltage drop?) or it reaches the programm=
ed limit.
> +	 */
> +	{ .addr =3D USBIN_AICL_OPTIONS_CFG,
> +	  .mask =3D 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 =3D 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 =3D PRE_CHARGE_CURRENT_CFG,
> +	  .mask =3D PRE_CHARGE_CURRENT_SETTING_MASK,
> +	  .val =3D 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 =3D FAST_CHARGE_CURRENT_CFG,
> +	  .mask =3D FAST_CHARGE_CURRENT_SETTING_MASK,
> +	  .addr =3D 1950000 / 25000 },
> +};
> +
> +static int smb2_init_hw(struct smb2_chip *chip)
> +{
> +	int rc, i;
> +
> +	for (i =3D 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 =3D 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;
> +}
> +
> +static int smb2_probe(struct platform_device *pdev)
> +{
> +	struct power_supply_config supply_config =3D {};
> +	struct smb2_chip *chip;
> +	int rc, irq;
> +
> +	chip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
> +	if (!chip)
> +		return -ENOMEM;
> +
> +	chip->dev =3D &pdev->dev;
> +	chip->name =3D pdev->name;
> +
> +	chip->regmap =3D dev_get_regmap(pdev->dev.parent, NULL);
> +	if (!chip->regmap) {
> +		return dev_err_probe(chip->dev, -ENODEV,
> +				     "failed to locate the regmap\n");
> +	}
> +
> +	rc =3D 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");
> +	}
> +
> +	irq =3D of_irq_get_byname(pdev->dev.of_node, "bat-ov");
> +	if (irq < 0) {
> +		return dev_err_probe(chip->dev, irq,
> +				     "Couldn't get irq bat-ov byname\n");
> +	}
> +
> +	rc =3D devm_request_threaded_irq(chip->dev, irq, NULL,
> +				       smb2_handle_batt_overvoltage, IRQF_ONESHOT,
> +				       "bat-ov", chip);
> +	if (irq < 0)
> +		return dev_err_probe(chip->dev, irq,

irq -> rc (for dev_err_probe and the if)

> +				     "Couldn't get irq bat-ov byname\n");
> +
> +	irq =3D of_irq_get_byname(pdev->dev.of_node, "usb-plugin");
> +	if (irq < 0)
> +		return dev_err_probe(chip->dev, irq,
> +				     "Couldn't get irq usb-plugin byname\n");
> +
> +	rc =3D devm_request_threaded_irq(chip->dev, irq, NULL,
> +				       smb2_handle_usb_plugin, IRQF_ONESHOT,
> +				       "usb-plugin", chip);
> +	if (irq < 0)
> +		return dev_err_probe(chip->dev, irq,

irq -> rc (for dev_err_probe and the if)

> +			"Couldn't request irq usb-plugin\n");
> +
> +
> +	irq =3D of_irq_get_byname(pdev->dev.of_node, "usbin-icl-change");
> +	if (irq < 0) {
> +		return dev_err_probe(chip->dev, irq,
> +				     "Couldn't get irq usbin-icl-change byname\n");
> +	}
> +
> +	rc =3D devm_request_threaded_irq(chip->dev, irq, NULL,
> +				       smb2_handle_usb_icl_change, IRQF_ONESHOT,
> +				       "usbin-icl-change", chip);
> +	if (rc < 0)
> +		return dev_err_probe(chip->dev, irq,

irq -> rc

> +			"Couldn't request irq usbin-icl-change\n");
> +
> +	irq =3D of_irq_get_byname(pdev->dev.of_node, "wdog-bark");
> +	if (irq < 0) {
> +		return dev_err_probe(chip->dev, irq,
> +				     "Couldn't get irq wdog-bark byname\n");
> +	}
> +
> +	rc =3D devm_request_threaded_irq(chip->dev, irq, NULL,
> +				       smb2_handle_wdog_bark, IRQF_ONESHOT,
> +				       "wdog-bark", chip);
> +	if (rc < 0)
> +		return dev_err_probe(chip->dev, irq,

irq -> rc

> +			"Couldn't request irq wdog-bark\n");
> +
> +	chip->usb_in_v_chan =3D 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 =3D 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 =3D smb2_init_hw(chip);
> +	if (rc < 0)
> +		return rc;
> +
> +	supply_config.drv_data =3D chip;
> +	supply_config.of_node =3D pdev->dev.of_node;
> +
> +	chip->chg_psy =3D 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");

You need to call this before requesting the irqs, since the
interrupts might trigger instantaneously resulting in a NULL
pointer dereference in power_supply_changed().

> +	rc =3D 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 =3D devm_delayed_work_autocancel(chip->dev, &chip->status_change_wor=
k,
> +					  smb2_status_change_work);
> +	if (rc)
> +		return dev_err_probe(chip->dev, rc,
> +				     "Failed to initialise status change work\n");

You need to call this before requesting the irq for smb2_handle_usb_plugin.

> +	rc =3D (chip->batt_info->voltage_max_design_uv - 3487500) / 7500 + 1;
> +	rc =3D 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");
> +
> +	platform_set_drvdata(pdev, chip);
> +
> +	/* Initialise charger state */
> +	schedule_delayed_work(&chip->status_change_work,
> +			      msecs_to_jiffies(1000));
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id smb2_match_id_table[] =3D {
> +	{ .compatible =3D "qcom,pmi8998-charger" },
> +	{ .compatible =3D "qcom,pm660-charger" },
> +	{ /* sentinal */ }
> +};
> +MODULE_DEVICE_TABLE(of, smb2_match_id_table);
> +
> +static struct platform_driver qcom_spmi_smb2 =3D {
> +	.probe =3D smb2_probe,
> +	.driver =3D {
> +			.name =3D "qcom-pmi8998-charger",
> +			.of_match_table =3D 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");

-- Sebastian

--2dn6ioxdq7jcbj5h
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmKifH0ACgkQ2O7X88g7
+pqPRA/9GE4m/Oa1JnTNVPFMeWgN+vRk8D5kkJ5C+E4F6l4nEAnKwG/dl7t9OUQQ
Van6kXVbp6Fe4mO7SZErfeHHBsyoOy8AnWic8IdtlKd/qnLV6JsZYJ/4+I502wgm
b7FUhMdkjKJkZZxYlzYT255OPyUOj8HNVhiNXftWy7RWlIj6IsqXtw2C+NyHV1VX
dK2Q/WbcHsCzQF2KuTpyZMfND/6YEh2t5mv4Jmf2RQJ5P/c6JmHBnhJA+4rm5wZK
PskJxAY5EeTV6BHH43XZYd68bmXpALc8lCNSDhu2weW9tmvHhmT2X0kUAEWNBtH+
Rbw/XhzDm0fks9OVUXxrna0FJoBq9Yguaj1zc4EpcncfVIHmje0tmXbsKDnfdW7U
6QGePx/ytVkapDqmyeGgcRPyuvuZe5FQ9l98hrZdTL9nYZnzuYqCNJMHHESaI0GI
zkE+PL5lGYo5X15Ko6JhhCZH1dfApSjGajEAjRjTelXXp5pc/tY8z1UQR2RzU2MB
l+f4vMY3qyui5maWJrUahIPWPT4BkhPPHwmb/AuPQTxsTR21BKEwkgC2VwiQ8juK
RpoYadFiPj57o7FClYlp4BM/sIHShebTZbcYtW1GxHmtteASkdzACshZfSfsNAgp
25OFdzRJDgmWOA4iNw/jDlEJxIQWShrB0P/ENjGs+/pk+PWZFqU=
=8nbn
-----END PGP SIGNATURE-----

--2dn6ioxdq7jcbj5h--