Commit 50dffbf7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply fixes from Sebastian Reichel:

 - mt6360_charger: Fix of_match for usb-otg-vbus regulator

 - rt9455: Fix unused-const-variable for !CONFIG_USB_PHY

* tag 'for-v6.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator
  power: rt9455: hide unused rt9455_boost_voltage_values
parents a52a0b39 1e0fb113

drivers/power/supply/mt6360_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static const struct regulator_ops mt6360_chg_otg_ops = { 
};



static const struct regulator_desc mt6360_otg_rdesc = {

	.of_match = "usb-otg-vbus",

	.of_match = "usb-otg-vbus-regulator",

	.name = "usb-otg-vbus",

	.ops = &mt6360_chg_otg_ops,

	.owner = THIS_MODULE,

drivers/power/supply/rt9455_charger.c

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ static const int rt9455_voreg_values[] = { 
	4450000, 4450000, 4450000, 4450000, 4450000, 4450000, 4450000, 4450000

};



#if IS_ENABLED(CONFIG_USB_PHY)

/*

 * When the charger is in boost mode, REG02[7:2] represent boost output

 * voltage.
@@ -207,6 +208,7 @@ static const int rt9455_boost_voltage_values[] = { 
	5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000,

	5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000, 5600000,

};

#endif



/* REG07[3:0] (VMREG) in uV */

static const int rt9455_vmreg_values[] = {