From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 6 Apr 2022 12:37:20 +0000 (+0200)
Subject: ARM: config: u8500: Re-enable AB8500 battery charging
X-Git-Tag: v6.6.17~7652^2~16^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62f6424514991ce6104f6a8becfd58e986f993b6;p=platform%2Fkernel%2Flinux-rpi.git

ARM: config: u8500: Re-enable AB8500 battery charging

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>
---

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 159dd98..a352207 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -84,6 +84,8 @@ CONFIG_SPI_GPIO=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_SENSORS_NTC_THERMISTOR=y
 CONFIG_THERMAL=y