diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2022-04-06 14:37:20 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2022-04-06 14:41:41 +0200 |
commit | 62f6424514991ce6104f6a8becfd58e986f993b6 (patch) | |
tree | c089b8c2f315d27149a19ea61e64c350c88b5bb1 /arch | |
parent | 93bcdaca6eccb6761194fa8340672792e17f8f66 (diff) | |
download | linux-stable-62f6424514991ce6104f6a8becfd58e986f993b6.tar.gz linux-stable-62f6424514991ce6104f6a8becfd58e986f993b6.tar.bz2 linux-stable-62f6424514991ce6104f6a8becfd58e986f993b6.zip |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 159dd98d7f74..a352207a64d7 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 |