Merge tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...

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 <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index aab41619ed02f6ebc0737970c1935b17d3889612,34b837b866c226410a4f93b7ffe5c5ba6e4d870a..6adab2408574930b4d771aae7b2535cfe8e227e5
--- 1/arch/arm64/configs/defconfig
--- 2/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