Commit 524af30c authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'qcom-drivers-for-6.3-3' of...

Merge tag 'qcom-drivers-for-6.3-3' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers

One more Qualcomm driver update for 6.3

This introduces the power-supply driver providing battery and power
supply status on many recent Qualcomm platforms, including the Qualcomm
SC8180X and SC8280XP laptop platforms and the SM8350 mobile platform.

It's introduced through the Qualcomm tree due to its dependencies on the
pmic_glink driver, which was merged already for v6.3.

* tag 'qcom-drivers-for-6.3-3' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  power: supply: Introduce Qualcomm PMIC GLINK power supply

Link: https://lore.kernel.org/r/20230215043658.1156472-1-andersson@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4ec98e6d 29e8142b
......@@ -183,6 +183,15 @@ config BATTERY_PMU
Say Y here to expose battery information on Apple machines
through the generic battery class.
config BATTERY_QCOM_BATTMGR
tristate "Qualcomm PMIC GLINK battery manager support"
depends on QCOM_PMIC_GLINK
select AUXILIARY_BUS
help
Say Y here to enable the Qualcomm PMIC GLINK power supply driver,
which is used on modern Qualcomm platforms to provide battery and
power supply information.
config BATTERY_OLPC
tristate "One Laptop Per Child battery"
depends on OLPC_EC
......
......@@ -34,6 +34,7 @@ obj-$(CONFIG_BATTERY_GAUGE_LTC2941) += ltc2941-battery-gauge.o
obj-$(CONFIG_BATTERY_GOLDFISH) += goldfish_battery.o
obj-$(CONFIG_BATTERY_LEGO_EV3) += lego_ev3_battery.o
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
obj-$(CONFIG_BATTERY_QCOM_BATTMGR) += qcom_battmgr.o
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
obj-$(CONFIG_BATTERY_SAMSUNG_SDI) += samsung-sdi-battery.o
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment