From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 6 Apr 2022 14:37:20 +0200
Subject: ARM: config: u8500: Re-enable AB8500 battery charging
Git-commit: 62f6424514991ce6104f6a8becfd58e986f993b6
Patch-mainline: v5.18-rc3
References: git-fixes

This is effectively a revert of the temporary disablement
patch. Battery charging now works!

We also enable static battery data for the Samsung SDI
batteries as used by the U8500 Samsung phones.

Cc: Lee Jones <lee.jones@linaro.org>
Fixes: a1149ae97554 ("ARM: ux500: Disable Power Supply and Battery Management by default")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Ivan T. Ivanov <iivanov@suse.de>
---
 arch/arm/configs/u8500_defconfig |    2 ++
 1 file changed, 2 insertions(+)

--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -67,6 +67,8 @@ CONFIG_SPI=y
 CONFIG_SPI_PL022=y
 CONFIG_GPIO_STMPE=y
 CONFIG_GPIO_TC3589X=y
+CONFIG_BATTERY_SAMSUNG_SDI=y
+CONFIG_AB8500_BM=y
 CONFIG_SENSORS_IIO_HWMON=y
 CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y