diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 02:04:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 02:04:23 +0100 |
| commit | 39f013440dbf5b1f209eadb3b4665d4f0e840b5b (patch) | |
| tree | b271967a0e45f47f7e203d94876d79327296c8f5 /drivers/platform | |
| parent | Merge tag 'pci-v6.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | power: reset: odroid-go-ultra: fix I2C dependency (diff) | |
| download | linux-39f013440dbf5b1f209eadb3b4665d4f0e840b5b.tar.xz linux-39f013440dbf5b1f209eadb3b4665d4f0e840b5b.zip | |
Merge tag 'for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"Nothing special for the power-supply subystem this time.
- power-supply core: remove faulty cooling logic
- convert all sysfs show() handlers from *printf() use sysfs_emit()
- bq25890: add dual-charger support required by Lenovo Yoga Tab 3 Pro
- bq27xxx: fix reporting critical level
- syscon-reboot: add priority property support
- new rt9467 charger driver
- new rt9471 charger driver
- new Odroid Go Ultra poweroff driver
- misc minor fixes and cleanups"
* tag 'for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (32 commits)
power: reset: odroid-go-ultra: fix I2C dependency
power: supply: leds: explicitly include linux/leds.h
dt-bindings: power: supply: pm8941-coincell: Don't require charging properties
dt-bindings: power: supply: pm8941-coincell: Add PM8998 compatible
power: reset: add Odroid Go Ultra poweroff driver
power: supply: rt9467: Fix spelling mistake "attache" -> "attach"
power: supply: rt9471: fix using wrong ce_gpio in rt9471_probe()
power: supply: max77650: Make max77650_charger_disable() return void
Documentation: power: rt9467: Document exported sysfs entries
power: supply: rt9467: Add Richtek RT9467 charger driver
dt-bindings: power: supply: Add Richtek RT9467 battery charger
Documentation: power: rt9471: Document exported sysfs entries
power: supply: rt9471: Add Richtek RT9471 charger driver
dt-bindings: power: supply: Add Richtek RT9471 battery charger
power: supply: max1721x: Use strscpy() is more robust and safer
power: supply: test-power: use strscpy() instead of strncpy()
power: supply: bq27xxx: fix reporting critical level
power: supply: bq256xx: Init ichg/vbat value with chip default value
power: supply: collie_battery: Convert to GPIO descriptors (part 2)
power: supply: remove faulty cooling logic
...
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/x86-android-tablets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/x86-android-tablets.c b/drivers/platform/x86/x86-android-tablets.c index 123a4618db55..111b007656fc 100644 --- a/drivers/platform/x86/x86-android-tablets.c +++ b/drivers/platform/x86/x86-android-tablets.c @@ -187,7 +187,7 @@ struct x86_dev_info { /* Generic / shared charger / battery settings */ static const char * const tusb1211_chg_det_psy[] = { "tusb1211-charger-detect" }; static const char * const bq24190_psy[] = { "bq24190-charger" }; -static const char * const bq25890_psy[] = { "bq25890-charger" }; +static const char * const bq25890_psy[] = { "bq25890-charger-0" }; static const struct property_entry fg_bq24190_supply_props[] = { PROPERTY_ENTRY_STRING_ARRAY("supplied-from", bq24190_psy), |