From: Arnd Bergmann Date: Tue, 8 Dec 2020 16:21:44 +0000 (+0100) Subject: Merge tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Tag: v5.11-rc1~92^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=249293397ec1ca29ac845c2d5d4c0c04ecdd9e29;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig i.MX defconfig update for 5.11: - A couple of patches that enable various i.MX audio drivers for i.MX8M. - Enable more drivers that are useful on Librem 5 hardware. * tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: Enable more Librem 5 hardware arm64: defconfig: Enable ASRC and EASRC arm64: defconfig: Enable additional sound drivers on i.MX8M Mini Link: https://lore.kernel.org/r/20201202142717.9262-6-shawnguo@kernel.org Signed-off-by: Arnd Bergmann --- 249293397ec1ca29ac845c2d5d4c0c04ecdd9e29 diff --cc arch/arm64/configs/defconfig index aab41619ed02f,34b837b866c22..6adab24085749 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -528,7 -524,8 +531,9 @@@ CONFIG_POWER_RESET_SYSCON= CONFIG_SYSCON_REBOOT_MODE=y CONFIG_BATTERY_SBS=m CONFIG_BATTERY_BQ27XXX=y +CONFIG_SENSORS_ARM_SCMI=y + CONFIG_BATTERY_MAX17042=m + CONFIG_CHARGER_BQ25980=m CONFIG_SENSORS_ARM_SCPI=y CONFIG_SENSORS_LM90=m CONFIG_SENSORS_PWM_FAN=m