Commit 94b7ed38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v6.6-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply fixes from Sebastian Reichel:

 - core: fix use after free during device release

 - ab8500: avoid reporting multiple batteries to userspace

 - rk817: fix DT node resource leak

 - misc. small fixes, mostly for compiler warnings/errors

* tag 'for-v6.6-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: rk817: Fix node refcount leak
  power: supply: core: fix use after free in uevent
  power: supply: rt9467: Fix rt9467_run_aicl()
  power: supply: rk817: Add missing module alias
  power: supply: ucs1002: fix error code in ucs1002_get_property()
  power: vexpress: fix -Wvoid-pointer-to-enum-cast warning
  power: reset: use capital "OR" for multiple licenses in SPDX
  pwr-mlxbf: extend Kconfig to include gpio-mlxbf3 dependency
  power: supply: rt5033_charger: recognize EXTCON setting
  power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo()
  power: supply: ab8500: Set typing and props
parents b02afe1d 488ef44c

drivers/power/reset/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ config NVMEM_REBOOT_MODE 


config POWER_MLXBF

	tristate "Mellanox BlueField power handling driver"

	depends on (GPIO_MLXBF2 && ACPI)

	depends on (GPIO_MLXBF2 || GPIO_MLXBF3) && ACPI

	help

	  This driver supports reset or low power mode handling for Mellanox BlueField.

drivers/power/reset/pwr-mlxbf.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only or BSD-3-Clause

// SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause



/*

 *  Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.

drivers/power/reset/vexpress-poweroff.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int vexpress_reset_probe(struct platform_device *pdev) 
		return PTR_ERR(regmap);

	dev_set_drvdata(&pdev->dev, regmap);



	switch ((enum vexpress_reset_func)match->data) {

	switch ((uintptr_t)match->data) {

	case FUNC_SHUTDOWN:

		vexpress_power_off_device = &pdev->dev;

		pm_power_off = vexpress_power_off;

drivers/power/supply/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ config BATTERY_RT5033 
config CHARGER_RT5033

	tristate "RT5033 battery charger support"

	depends on MFD_RT5033

	depends on EXTCON || !EXTCON

	help

	  This adds support for battery charger in Richtek RT5033 PMIC.

	  The device supports pre-charge mode, fast charge mode and

drivers/power/supply/ab8500_btemp.c

+1 −8
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ struct ab8500_btemp { 
static enum power_supply_property ab8500_btemp_props[] = {

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_TEMP,

};
@@ -532,12 +531,6 @@ static int ab8500_btemp_get_property(struct power_supply *psy, 
		else

			val->intval = 1;

		break;

	case POWER_SUPPLY_PROP_TECHNOLOGY:

		if (di->bm->bi)

			val->intval = di->bm->bi->technology;

		else

			val->intval = POWER_SUPPLY_TECHNOLOGY_UNKNOWN;

		break;

	case POWER_SUPPLY_PROP_TEMP:

		val->intval = ab8500_btemp_get_temp(di);

		break;
@@ -662,7 +655,7 @@ static char *supply_interface[] = { 


static const struct power_supply_desc ab8500_btemp_desc = {

	.name			= "ab8500_btemp",

	.type			= POWER_SUPPLY_TYPE_BATTERY,

	.type			= POWER_SUPPLY_TYPE_UNKNOWN,

	.properties		= ab8500_btemp_props,

	.num_properties		= ARRAY_SIZE(ab8500_btemp_props),

	.get_property		= ab8500_btemp_get_property,