From nobody Thu Apr 9 18:55:16 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50B693B52E3 for ; Fri, 6 Mar 2026 14:33:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772807624; cv=none; b=oUCnbgxgimU4KvPr0v1K26CaJwR/0ipzhXHOau6mL9G/YmwMpR2zXzt6pwTRP0cgHnTaGxT+9mV2g9EJulvIQWrDLIz0XBMD6thgpSRxE5tQ7D1bJS8mZe5KHM7UTErRYl7bHLr45ZGko0oYZpmpUb9syUGF5pXiXtefzO7zQeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772807624; c=relaxed/simple; bh=2FRt1CMOeDBi+ujSYpU8g2MoZjv4gg2WASiAGR4BCTE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uXDNR6Q5qSW9UYB4Zaym1sxUE9l9s/JGeL3gEfKgP6F0bcP9Ky3EZWgT/mwWlvvokJD5RvLnwz/hpGADkFFywiOHJrn/LQWsn/3R7DJyFxHiw9HJvw7/vsMkcbI8w50eiX/ZMrZPurGWtAjiKKnzvBraQyb34y7aWyXqtym+SzA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=flipper.net; spf=pass smtp.mailfrom=flipper.net; dkim=pass (2048-bit key) header.d=flipper.net header.i=@flipper.net header.b=KrpqSm2A; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=flipper.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flipper.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=flipper.net header.i=@flipper.net header.b="KrpqSm2A" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-4327790c4e9so7154386f8f.2 for ; Fri, 06 Mar 2026 06:33:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flipper.net; s=google; t=1772807621; x=1773412421; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=IJMru6MZkUAstlWRCj83fHNH00MaKj2n7fewPDh1WhI=; b=KrpqSm2AqQbMEpZ97X7YBb9b9OYa0i7OK6dNVe1YJ8dAxQGXX6KbCY+JD0GA+lKrIS FR1Gishzf8zuimrT6agzkltVpaSmEihibPRZJFxwieX4qjOpKH1LctNA8Exou7zdXQPW kuYfx/LJnifxgy+B531A/+eYkoRG8tXq0kF8te+0aXzI02jkIbh5ey6no+ktRavcPE2M QNJ9rhwrb+kEt7eRyh87TqI4mCC7Wd528t1KmzgkN3EnVrYb/rwKiJSnicXevuiQ0+2g hDVV6Bnjv7Wb/N5RUu1Bx8tOytSpdo5zin0LrleKcZZWeeRbssEnzCacvx0WI1dlUHxD RVvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772807621; x=1773412421; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IJMru6MZkUAstlWRCj83fHNH00MaKj2n7fewPDh1WhI=; b=rgLcWFUzxDD2N44KVvxoMmQUUtezN8pXtjl8NTRYNdceia+VdQ8aOUF9s+MCs1f6No L8FIGZAUvgTSS8MDRn6u+9biFJMsMS48UUSsz64CjpDgRF0JILdE0m7vnW0EDzmBQU2J e8sBUw+O1YC3+DUrIUoqObba6ZPMqf8tLTYQTHUrMzaezMwl2HlLGia0hXJVIlG8edyb M4K+Z7Wt/S3dYSImzdHXkm0H/balVV6R8LKLyb2N0PjAKBl3dCI//wJqjAYDmUEtXXLM mgA9TGE/y706SOC0C9sOQXA1Twnei9FAU83U9EzqCLF5zQTY3TnmMkorl6ZxZQgnKrxY X7mA== X-Forwarded-Encrypted: i=1; AJvYcCXx3QOSLoIfV6n1wAL7yEMunBHGrbCwjk+i+MBENJfyX9FuFC5Gc5vVcky0oRMfsyPIFmiNO5Bo1AoQbR4=@vger.kernel.org X-Gm-Message-State: AOJu0YzMBMSJsD4WdlQj30uHNzajV8NBjHlqbKyUScgeIYz/50Bsgsfx YlQPwHc5ZSmQVGbBPuB5bozKmbPkaQvqm2+t8WEz+vpiUkeqLJG2VPQNMlp8oIaHjkQ= X-Gm-Gg: ATEYQzy7sNz9PtZ5291GQnZbuRYqaNsmrw52/vSQgBQz33FWVeJpjlhp5Z9/IWXrOsy xOg3eJhumGYIZVV2xWO/g7f9wwmlFcZ7jr5Xlb0MiJRxqZ4MdcqdKDuI2Jkykuo6Wp3USKZ79wA rryX9dzPmk+aVAAd8AGCvoMNw4Ta8sgpUUdwcnJHZWuDGEsbfy4nc/39N0VPPW+sM8PQBwkt5Q4 VSl+96Y+Ej0x3nRJYqAIlBbywLG+GmRG4C/HRpBTMsi3vNPYcoYnE7siIVZ4GpPJjozkERrpHOA VVrrwrCvbDK7anaRSVVHxJZZ1Vgj4ajcYgvoCHpssutIrSWdQVgdP0A5mqFhKTIPE+qR/kI4euv q0KUrEVMoc4X9gnBBnJaSTRt/MBpE5Kq2XiImPF25qYCCfqfE1cqnoTsdAn03zRHMH/kf5ZiBGq c5WFmk3aiEYeu/kBSPY0DqM5r0veC1aFQG0yMKu/mLcqaUmcwl4cNNKZDXPtVy6NQE+MuuTfOql q9xsw== X-Received: by 2002:a05:6000:228a:b0:439:c202:99aa with SMTP id ffacd0b85a97d-439da885b6dmr4425282f8f.38.1772807619433; Fri, 06 Mar 2026 06:33:39 -0800 (PST) Received: from alchark-surface.localdomain (bba-86-98-192-109.alshamil.net.ae. [86.98.192.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8daf2sm4635281f8f.2.2026.03.06.06.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 06:33:39 -0800 (PST) From: Alexey Charkov Date: Fri, 06 Mar 2026 18:33:11 +0400 Subject: [PATCH v2 11/11] power: supply: bq257xx: Add support for BQ25792 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260306-bq25792-v2-11-6595249d6e6f@flipper.net> References: <20260306-bq25792-v2-0-6595249d6e6f@flipper.net> In-Reply-To: <20260306-bq25792-v2-0-6595249d6e6f@flipper.net> To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chris Morgan , Liam Girdwood , Mark Brown , Sebastian Reichel Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , linux-pm@vger.kernel.org, Alexey Charkov X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=22800; i=alchark@flipper.net; h=from:subject:message-id; bh=2FRt1CMOeDBi+ujSYpU8g2MoZjv4gg2WASiAGR4BCTE=; b=owGbwMvMwCW2adGNfoHIK0sZT6slMWSuerpE6XUex9WfJ50S7f1C1x1LNo+12v/s7betn6JEl or7T5t3qmMiC4MYF4OlmCLL3G9LbKca8c3a5eHxFWYOKxPIEGmRBgYgYGHgy03MKzXSMdIz1TbU MzTUMdYxYuDiFICpzuVl+B9/n336LasXl1/khDTtjEjz8F0k4f9nQ8hNx986DxdbbHNl+F+3b8G OkrKDnyxtdqk+63739My7H3tyruSvv5dzovnQxCx2AA== X-Developer-Key: i=alchark@flipper.net; a=openpgp; fpr=9DF6A43D95320E9ABA4848F5B2A2D88F1059D4A5 Add support for TI BQ25792 integrated battery charger and buck-boost converter. It shares high-level logic of operation with the already supported BQ25703A, but has a different register map, bit definitions and some of the lower-level hardware states. Signed-off-by: Alexey Charkov --- drivers/power/supply/bq257xx_charger.c | 491 +++++++++++++++++++++++++++++= +++- include/linux/mfd/bq257xx.h | 6 +- 2 files changed, 492 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/bq257xx_charger.c b/drivers/power/supply/= bq257xx_charger.c index 951abd035fc5..55337a9607fc 100644 --- a/drivers/power/supply/bq257xx_charger.c +++ b/drivers/power/supply/bq257xx_charger.c @@ -5,6 +5,7 @@ */ =20 #include +#include #include #include #include @@ -18,12 +19,19 @@ struct bq257xx_chg; =20 /** * struct bq257xx_chip_info - chip specific routines + * @default_iindpm_uA: default input current limit in microamps * @bq257xx_hw_init: init function for hw * @bq257xx_hw_shutdown: shutdown function for hw * @bq257xx_get_state: get and update state of hardware + * @bq257xx_get_ichg: get maximum charge current (in uA) * @bq257xx_set_ichg: set maximum charge current (in uA) + * @bq257xx_get_vbatreg: get maximum charge voltage (in uV) * @bq257xx_set_vbatreg: set maximum charge voltage (in uV) + * @bq257xx_get_iindpm: get maximum input current (in uA) * @bq257xx_set_iindpm: set maximum input current (in uA) + * @bq257xx_get_cur: get battery current from ADC (in uA) + * @bq257xx_get_vbat: get battery voltage from ADC (in uV) + * @bq257xx_get_min_vsys: get minimum system voltage (in uV) */ struct bq257xx_chip_info { int default_iindpm_uA; @@ -47,8 +55,10 @@ struct bq257xx_chip_info { * @bq: parent MFD device * @charger: power supply device * @online: charger input is present + * @charging: charger is actively charging the battery * @fast_charge: charger is in fast charge mode * @pre_charge: charger is in pre-charge mode + * @overvoltage: overvoltage fault detected * @ov_fault: charger reports over voltage fault * @batoc_fault: charger reports battery over current fault * @oc_fault: charger reports over current fault @@ -79,6 +89,53 @@ struct bq257xx_chg { u32 vsys_min; }; =20 +/** + * bq25792_read16() - Read a 16-bit value from device register + * @pdata: driver platform data + * @reg: register address to read from + * @val: pointer to store the register value + * + * Read a 16-bit big-endian value from the BQ25792 device via regmap + * and convert to CPU byte order. + * + * Return: Returns 0 on success or error on failure to read. + */ +static int bq25792_read16(struct bq257xx_chg *pdata, unsigned int reg, u16= *val) +{ + __be16 regval; + int ret; + + ret =3D regmap_raw_read(pdata->bq->regmap, reg, ®val, sizeof(regval)); + if (ret) + return ret; + + *val =3D be16_to_cpu(regval); + return 0; +} + +/** + * bq25792_write16() - Write a 16-bit value to device register + * @pdata: driver platform data + * @reg: register address to write to + * @val: 16-bit value to write in CPU byte order + * + * Convert the value to big-endian and write a 16-bit value to the + * BQ25792 device via regmap. + * + * Return: Returns 0 on success or error on failure to write. + */ +static int bq25792_write16(struct bq257xx_chg *pdata, unsigned int reg, u1= 6 val) +{ + __be16 regval =3D cpu_to_be16(val); + int ret; + + ret =3D regmap_raw_write(pdata->bq->regmap, reg, ®val, sizeof(regval)); + if (ret) + return ret; + + return 0; +} + /** * bq25703_get_state() - Get the current state of the device * @pdata: driver platform data @@ -110,6 +167,43 @@ static int bq25703_get_state(struct bq257xx_chg *pdata) return 0; } =20 +/** + * bq25792_get_state() - Get the current state of the device + * @pdata: driver platform data + * + * Get the current state of the BQ25792 charger by reading status + * registers. Updates the online, charging, overvoltage, and fault + * status fields in the driver data structure. + * + * Return: Returns 0 on success or error on failure to read device. + */ +static int bq25792_get_state(struct bq257xx_chg *pdata) +{ + unsigned int reg; + int ret; + + ret =3D regmap_read(pdata->bq->regmap, BQ25792_REG1B_CHARGER_STATUS_0, &r= eg); + if (ret) + return ret; + + pdata->online =3D reg & BQ25792_REG1B_PG_STAT; + + ret =3D regmap_read(pdata->bq->regmap, BQ25792_REG1C_CHARGER_STATUS_1, &r= eg); + if (ret) + return ret; + + pdata->charging =3D reg & BQ25792_REG1C_CHG_STAT_MASK; + + ret =3D regmap_read(pdata->bq->regmap, BQ25792_REG20_FAULT_STATUS_0, ®= ); + if (ret) + return ret; + + pdata->overvoltage =3D reg & BQ25792_REG20_OVERVOLTAGE_MASK; + pdata->oc_fault =3D reg & BQ25792_REG20_OVERCURRENT_MASK; + + return 0; +} + /** * bq25703_get_min_vsys() - Get the minimum system voltage * @pdata: driver platform data @@ -133,6 +227,31 @@ static int bq25703_get_min_vsys(struct bq257xx_chg *pd= ata, int *intval) return ret; } =20 +/** + * bq25792_get_min_vsys() - Get the minimum system voltage + * @pdata: driver platform data + * @intval: pointer to store the minimum voltage value + * + * Read the current minimum system voltage setting from the device + * and return it in microvolts. + * + * Return: Returns 0 on success or error on failure to read. + */ +static int bq25792_get_min_vsys(struct bq257xx_chg *pdata, int *intval) +{ + unsigned int reg; + int ret; + + ret =3D regmap_read(pdata->bq->regmap, BQ25792_REG00_MIN_SYS_VOLTAGE, &re= g); + if (ret) + return ret; + + reg =3D FIELD_GET(BQ25792_REG00_VSYSMIN_MASK, reg); + *intval =3D (reg * BQ25792_MINVSYS_STEP_UV) + BQ25792_MINVSYS_MIN_UV; + + return ret; +} + /** * bq25703_set_min_vsys() - Set the minimum system voltage * @pdata: driver platform data @@ -157,6 +276,29 @@ static int bq25703_set_min_vsys(struct bq257xx_chg *pd= ata, int vsys) reg); } =20 +/** + * bq25792_set_min_vsys() - Set the minimum system voltage + * @pdata: driver platform data + * @vsys: voltage value to set in uV + * + * Set the minimum system voltage by clamping the requested value + * between device limits and writing to the appropriate register. + * + * Return: Returns 0 on success or error on failure to write. + */ +static int bq25792_set_min_vsys(struct bq257xx_chg *pdata, int vsys) +{ + unsigned int reg; + int vsys_min =3D pdata->vsys_min; + + vsys =3D clamp(vsys, vsys_min, BQ25792_MINVSYS_MAX_UV); + reg =3D ((vsys - BQ25792_MINVSYS_MIN_UV) / BQ25792_MINVSYS_STEP_UV); + reg =3D FIELD_PREP(BQ25792_REG00_VSYSMIN_MASK, reg); + + return regmap_write(pdata->bq->regmap, + BQ25792_REG00_MIN_SYS_VOLTAGE, reg); +} + /** * bq25703_get_cur() - Get the reported current from the battery * @pdata: driver platform data @@ -186,6 +328,30 @@ static int bq25703_get_cur(struct bq257xx_chg *pdata, = int *intval) return ret; } =20 +/** + * bq25792_get_cur() - Get the reported current from the battery + * @pdata: driver platform data + * @intval: pointer to store the battery current value + * + * Read the current ADC value from the device representing the battery + * charge or discharge current and return it in microamps. + * + * Return: Returns 0 on success or error on failure to read. + */ +static int bq25792_get_cur(struct bq257xx_chg *pdata, int *intval) +{ + u16 reg; + int ret; + + ret =3D bq25792_read16(pdata, BQ25792_REG33_IBAT_ADC, ®); + if (ret < 0) + return ret; + + *intval =3D (s16)reg * BQ25792_ADCIBAT_STEP_UA; + + return ret; +} + /** * bq25703_get_ichg_cur() - Get the maximum reported charge current * @pdata: driver platform data @@ -209,6 +375,30 @@ static int bq25703_get_ichg_cur(struct bq257xx_chg *pd= ata, int *intval) return ret; } =20 +/** + * bq25792_get_ichg_cur() - Get the maximum reported charge current + * @pdata: driver platform data + * @intval: pointer to store the maximum charge current value + * + * Read the programmed maximum charge current limit from the device. + * + * Return: Returns 0 on success or error on failure to read value. + */ +static int bq25792_get_ichg_cur(struct bq257xx_chg *pdata, int *intval) +{ + u16 reg; + int ret; + + ret =3D bq25792_read16(pdata, BQ25792_REG03_CHARGE_CURRENT_LIMIT, ®); + if (ret) + return ret; + + *intval =3D FIELD_GET(BQ25792_REG03_ICHG_MASK, reg) * + BQ25792_ICHG_STEP_UA; + + return ret; +} + /** * bq25703_set_ichg_cur() - Set the maximum charge current * @pdata: driver platform data @@ -233,6 +423,28 @@ static int bq25703_set_ichg_cur(struct bq257xx_chg *pd= ata, int ichg) reg); } =20 +/** + * bq25792_set_ichg_cur() - Set the maximum charge current + * @pdata: driver platform data + * @ichg: current value to set in uA + * + * Set the maximum charge current by clamping the requested value + * between device limits and writing to the appropriate register. + * + * Return: Returns 0 on success or error on failure to write. + */ +static int bq25792_set_ichg_cur(struct bq257xx_chg *pdata, int ichg) +{ + int ichg_max =3D pdata->ichg_max; + u16 reg; + + ichg =3D clamp(ichg, BQ25792_ICHG_MIN_UA, ichg_max); + reg =3D FIELD_PREP(BQ25792_REG03_ICHG_MASK, + (ichg / BQ25792_ICHG_STEP_UA)); + + return bq25792_write16(pdata, BQ25792_REG03_CHARGE_CURRENT_LIMIT, reg); +} + /** * bq25703_get_chrg_volt() - Get the maximum set charge voltage * @pdata: driver platform data @@ -256,6 +468,30 @@ static int bq25703_get_chrg_volt(struct bq257xx_chg *p= data, int *intval) return ret; } =20 +/** + * bq25792_get_chrg_volt() - Get the maximum set charge voltage + * @pdata: driver platform data + * @intval: pointer to store the maximum charge voltage value + * + * Read the current charge voltage limit from the device. + * + * Return: Returns 0 on success or error on failure to read value. + */ +static int bq25792_get_chrg_volt(struct bq257xx_chg *pdata, int *intval) +{ + u16 reg; + int ret; + + ret =3D bq25792_read16(pdata, BQ25792_REG01_CHARGE_VOLTAGE_LIMIT, ®); + if (ret) + return ret; + + *intval =3D FIELD_GET(BQ25792_REG01_VREG_MASK, reg) * + BQ25792_VBATREG_STEP_UV; + + return ret; +} + /** * bq25703_set_chrg_volt() - Set the maximum charge voltage * @pdata: driver platform data @@ -282,6 +518,29 @@ static int bq25703_set_chrg_volt(struct bq257xx_chg *p= data, int vbat) reg); } =20 +/** + * bq25792_set_chrg_volt() - Set the maximum charge voltage + * @pdata: driver platform data + * @vbat: voltage value to set in uV + * + * Set the maximum charge voltage by clamping the requested value + * between device limits and writing to the appropriate register. + * + * Return: Returns 0 on success or error on failure to write. + */ +static int bq25792_set_chrg_volt(struct bq257xx_chg *pdata, int vbat) +{ + int vbat_max =3D pdata->vbat_max; + u16 reg; + + vbat =3D clamp(vbat, BQ25792_VBATREG_MIN_UV, vbat_max); + + reg =3D FIELD_PREP(BQ25792_REG01_VREG_MASK, + (vbat / BQ25792_VBATREG_STEP_UV)); + + return bq25792_write16(pdata, BQ25792_REG01_CHARGE_VOLTAGE_LIMIT, reg); +} + /** * bq25703_get_iindpm() - Get the maximum set input current * @pdata: driver platform data @@ -310,6 +569,30 @@ static int bq25703_get_iindpm(struct bq257xx_chg *pdat= a, int *intval) return ret; } =20 +/** + * bq25792_get_iindpm() - Get the maximum set input current + * @pdata: driver platform data + * @intval: pointer to store the maximum input current value + * + * Read the current input current limit from the device. + * + * Return: Returns 0 on success or error on failure to read value. + */ +static int bq25792_get_iindpm(struct bq257xx_chg *pdata, int *intval) +{ + u16 reg; + int ret; + + ret =3D bq25792_read16(pdata, BQ25792_REG06_INPUT_CURRENT_LIMIT, ®); + if (ret) + return ret; + + reg =3D FIELD_GET(BQ25792_REG06_IINDPM_MASK, reg); + *intval =3D reg * BQ25792_IINDPM_STEP_UA; + + return ret; +} + /** * bq25703_set_iindpm() - Set the maximum input current * @pdata: driver platform data @@ -335,6 +618,29 @@ static int bq25703_set_iindpm(struct bq257xx_chg *pdat= a, int iindpm) FIELD_PREP(BQ25703_IINDPM_MASK, reg)); } =20 +/** + * bq25792_set_iindpm() - Set the maximum input current + * @pdata: driver platform data + * @iindpm: current value in uA + * + * Set the maximum input current by clamping the requested value + * between device limits and writing to the appropriate register. + * + * Return: Returns 0 on success or error on failure to write. + */ +static int bq25792_set_iindpm(struct bq257xx_chg *pdata, int iindpm) +{ + u16 reg; + int iindpm_max =3D pdata->iindpm_max; + + iindpm =3D clamp(iindpm, BQ25792_IINDPM_MIN_UA, iindpm_max); + + reg =3D iindpm / BQ25792_IINDPM_STEP_UA; + + return bq25792_write16(pdata, BQ25792_REG06_INPUT_CURRENT_LIMIT, + FIELD_PREP(BQ25792_REG06_IINDPM_MASK, reg)); +} + /** * bq25703_get_vbat() - Get the reported voltage from the battery * @pdata: driver platform data @@ -359,6 +665,30 @@ static int bq25703_get_vbat(struct bq257xx_chg *pdata,= int *intval) return ret; } =20 +/** + * bq25792_get_vbat() - Get the reported voltage from the battery + * @pdata: driver platform data + * @intval: pointer to store the battery voltage value + * + * Read the current ADC value representing the battery voltage + * and return it in microvolts. + * + * Return: Returns 0 on success or error on failure to read value. + */ +static int bq25792_get_vbat(struct bq257xx_chg *pdata, int *intval) +{ + u16 reg; + int ret; + + ret =3D bq25792_read16(pdata, BQ25792_REG3B_VBAT_ADC, ®); + if (ret) + return ret; + + *intval =3D reg * BQ25792_ADCVSYSVBAT_STEP_UV; + + return ret; +} + /** * bq25703_hw_init() - Set all the required registers to init the charger * @pdata: driver platform data @@ -425,6 +755,61 @@ static int bq25703_hw_init(struct bq257xx_chg *pdata) return ret; } =20 +/** + * bq25792_hw_init() - Initialize BQ25792 hardware + * @pdata: driver platform data + * + * Initialize the BQ25792 by disabling the watchdog, enabling discharge + * current sensing with 5A limit, and configuring input current regulation. + * Set the charge current, charge voltage, minimum system voltage, and + * input current limit from platform data. Enable and configure the ADC + * to measure all available channels. + * + * Return: Returns 0 on success or error code on error. + */ +static int bq25792_hw_init(struct bq257xx_chg *pdata) +{ + struct regmap *regmap =3D pdata->bq->regmap; + int ret =3D 0; + + /* Disable watchdog (TODO: make it work instead) */ + regmap_write(regmap, BQ25792_REG10_CHARGER_CONTROL_1, 0); + + /* + * Enable battery discharge current sensing, 5A discharge current + * limit, input current regulation + */ + regmap_write(regmap, BQ25792_REG14_CHARGER_CONTROL_5, + BQ25792_REG14_EN_IBAT | + BQ25792_IBAT_5A | + BQ25792_REG14_EN_IINDPM); + + ret =3D pdata->chip->bq257xx_set_ichg(pdata, pdata->ichg_max); + if (ret) + return ret; + + ret =3D pdata->chip->bq257xx_set_vbatreg(pdata, pdata->vbat_max); + if (ret) + return ret; + + ret =3D bq25792_set_min_vsys(pdata, pdata->vsys_min); + if (ret) + return ret; + + ret =3D pdata->chip->bq257xx_set_iindpm(pdata, pdata->iindpm_max); + if (ret) + return ret; + + /* Enable the ADC. */ + regmap_write(regmap, BQ25792_REG2E_ADC_CONTROL, BQ25792_REG2E_ADC_EN); + + /* Clear per-channel ADC disable bits - enable all channels */ + regmap_write(regmap, BQ25792_REG2F_ADC_FUNCTION_DISABLE_0, 0); + regmap_write(regmap, BQ25792_REG30_ADC_FUNCTION_DISABLE_1, 0); + + return ret; +} + /** * bq25703_hw_shutdown() - Set registers for shutdown * @pdata: driver platform data @@ -437,6 +822,30 @@ static void bq25703_hw_shutdown(struct bq257xx_chg *pd= ata) BQ25703_EN_LWPWR, BQ25703_EN_LWPWR); } =20 +/** + * bq25792_hw_shutdown() - Shutdown BQ25792 hardware + * @pdata: driver platform data + * + * Perform hardware shutdown for the BQ25792. Currently a no-op + * as the device does not require special shutdown configuration. + */ +static void bq25792_hw_shutdown(struct bq257xx_chg *pdata) +{ + /* Nothing to do here */ +} + +/** + * bq257xx_set_charger_property() - Set a power supply property + * @psy: power supply device + * @prop: power supply property to set + * @val: value to set for the property + * + * Handle requests to set power supply properties such as input current + * limit, constant charge voltage, and constant charge current. Routes + * the request to the chip-specific implementation. + * + * Return: Returns 0 on success or -EINVAL if property is not supported. + */ static int bq257xx_set_charger_property(struct power_supply *psy, enum power_supply_property prop, const union power_supply_propval *val) @@ -460,6 +869,19 @@ static int bq257xx_set_charger_property(struct power_s= upply *psy, return -EINVAL; } =20 +/** + * bq257xx_get_charger_property() - Get a power supply property + * @psy: power supply device + * @psp: power supply property to get + * @val: pointer to store the property value + * + * Handle requests to get power supply properties, including status, + * health, manufacturer, online state, and various voltage/current + * measurements. Reads current device state and routes chip-specific + * property requests to appropriate handlers. + * + * Return: Returns 0 on success or -EINVAL if property is not supported. + */ static int bq257xx_get_charger_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -541,6 +963,17 @@ static enum power_supply_property bq257xx_power_supply= _props[] =3D { POWER_SUPPLY_PROP_USB_TYPE, }; =20 +/** + * bq257xx_property_is_writeable() - Check if a property is writeable + * @psy: power supply device + * @prop: power supply property to check + * + * Determines which power supply properties can be written to. Only + * charge current limit, charge voltage limit, and input current + * limit are writeable. + * + * Return: Returns 1 if property is writeable, 0 otherwise. + */ static int bq257xx_property_is_writeable(struct power_supply *psy, enum power_supply_property prop) { @@ -613,6 +1046,17 @@ static void bq257xx_external_power_changed(struct pow= er_supply *psy) power_supply_changed(psy); } =20 +/** + * bq257xx_irq_handler_thread() - Handle charger interrupt + * @irq: interrupt number + * @private: pointer to driver private data + * + * Thread handler for charger interrupts. Triggers re-evaluation of + * external power status and updates power supply state in response + * to charger events. + * + * Return: Returns IRQ_HANDLED if interrupt was processed. + */ static irqreturn_t bq257xx_irq_handler_thread(int irq, void *private) { struct bq257xx_chg *pdata =3D private; @@ -653,6 +1097,22 @@ static const struct bq257xx_chip_info bq25703_chip_in= fo =3D { .bq257xx_get_min_vsys =3D &bq25703_get_min_vsys, }; =20 +static const struct bq257xx_chip_info bq25792_chip_info =3D { + .default_iindpm_uA =3D BQ25792_IINDPM_DEFAULT_UA, + .bq257xx_hw_init =3D &bq25792_hw_init, + .bq257xx_hw_shutdown =3D &bq25792_hw_shutdown, + .bq257xx_get_state =3D &bq25792_get_state, + .bq257xx_get_ichg =3D &bq25792_get_ichg_cur, + .bq257xx_set_ichg =3D &bq25792_set_ichg_cur, + .bq257xx_get_vbatreg =3D &bq25792_get_chrg_volt, + .bq257xx_set_vbatreg =3D &bq25792_set_chrg_volt, + .bq257xx_get_iindpm =3D &bq25792_get_iindpm, + .bq257xx_set_iindpm =3D &bq25792_set_iindpm, + .bq257xx_get_cur =3D &bq25792_get_cur, + .bq257xx_get_vbat =3D &bq25792_get_vbat, + .bq257xx_get_min_vsys =3D &bq25792_get_min_vsys, +}; + /** * bq257xx_parse_dt() - Parse the device tree for required properties * @pdata: driver platform data @@ -698,10 +1158,22 @@ static int bq257xx_parse_dt(struct bq257xx_chg *pdat= a, return 0; } =20 +/** + * bq257xx_charger_probe() - Probe routine for charger platform device + * @pdev: platform device + * + * Probe the charger device, allocate driver data structure, select the + * appropriate chip-specific function pointers, register the power supply, + * parse device tree properties for battery limits, initialize hardware, + * and set up the interrupt handler if available. + * + * Return: Returns 0 on success or error code on failure. + */ static int bq257xx_charger_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct bq257xx_device *bq =3D dev_get_drvdata(pdev->dev.parent); + struct bq257xx_plat *plat =3D dev_get_platdata(dev); struct bq257xx_chg *pdata; struct power_supply_config psy_cfg =3D { }; int ret; @@ -713,7 +1185,17 @@ static int bq257xx_charger_probe(struct platform_devi= ce *pdev) return -ENOMEM; =20 pdata->bq =3D bq; - pdata->chip =3D &bq25703_chip_info; + + switch (plat->type) { + case BQ25703A: + pdata->chip =3D &bq25703_chip_info; + break; + case BQ25792: + pdata->chip =3D &bq25792_chip_info; + break; + default: + return dev_err_probe(dev, -EINVAL, "Unknown chip type\n"); + } =20 platform_set_drvdata(pdev, pdata); =20 @@ -751,6 +1233,13 @@ static int bq257xx_charger_probe(struct platform_devi= ce *pdev) return ret; } =20 +/** + * bq257xx_charger_shutdown() - Shutdown routine for charger platform devi= ce + * @pdev: platform device + * + * Called during system shutdown to perform charger cleanup, including + * disabling watchdog timers or other chip-specific shutdown procedures. + */ static void bq257xx_charger_shutdown(struct platform_device *pdev) { struct bq257xx_chg *pdata =3D platform_get_drvdata(pdev); diff --git a/include/linux/mfd/bq257xx.h b/include/linux/mfd/bq257xx.h index b2e38a4a4738..0d568e8b1835 100644 --- a/include/linux/mfd/bq257xx.h +++ b/include/linux/mfd/bq257xx.h @@ -353,12 +353,10 @@ #define BQ25792_REG20_VAC2_OVP_STAT BIT(1) #define BQ25792_REG20_VAC1_OVP_STAT BIT(0) =20 -#define BQ25792_REG20_OVERVOLTAGE_MASK (BQ25792_REG20_VBUS_OVP_STAT | \ - BQ25792_REG20_VBAT_OVP_STAT | \ +#define BQ25792_REG20_OVERVOLTAGE_MASK (BQ25792_REG20_VBAT_OVP_STAT | \ BQ25792_REG20_VAC2_OVP_STAT | \ BQ25792_REG20_VAC1_OVP_STAT) -#define BQ25792_REG20_OVERCURRENT_MASK (BQ25792_REG20_IBUS_OCP_STAT | \ - BQ25792_REG20_IBAT_OCP_STAT | \ +#define BQ25792_REG20_OVERCURRENT_MASK (BQ25792_REG20_IBAT_OCP_STAT | \ BQ25792_REG20_CONV_OCP_STAT) =20 /* FAULT Status 1 */ --=20 2.52.0