Skip to content

Commit 524af30

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4ec98e6 + 29e8142 commit 524af30

File tree

3 files changed

+1421
-0
lines changed

3 files changed

+1421
-0
lines changed

drivers/power/supply/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,15 @@ config BATTERY_PMU
183183
Say Y here to expose battery information on Apple machines
184184
through the generic battery class.
185185

186+
config BATTERY_QCOM_BATTMGR
187+
tristate "Qualcomm PMIC GLINK battery manager support"
188+
depends on QCOM_PMIC_GLINK
189+
select AUXILIARY_BUS
190+
help
191+
Say Y here to enable the Qualcomm PMIC GLINK power supply driver,
192+
which is used on modern Qualcomm platforms to provide battery and
193+
power supply information.
194+
186195
config BATTERY_OLPC
187196
tristate "One Laptop Per Child battery"
188197
depends on OLPC_EC

drivers/power/supply/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ obj-$(CONFIG_BATTERY_GAUGE_LTC2941) += ltc2941-battery-gauge.o
3434
obj-$(CONFIG_BATTERY_GOLDFISH) += goldfish_battery.o
3535
obj-$(CONFIG_BATTERY_LEGO_EV3) += lego_ev3_battery.o
3636
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
37+
obj-$(CONFIG_BATTERY_QCOM_BATTMGR) += qcom_battmgr.o
3738
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
3839
obj-$(CONFIG_BATTERY_SAMSUNG_SDI) += samsung-sdi-battery.o
3940
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o

0 commit comments

Comments
 (0)