Merge tag 'ux500-defconfig-soc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 14 Apr 2022 20:48:30 +0000 (22:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Apr 2022 20:48:32 +0000 (22:48 +0200)
commitcfd08b94bed0a90d64fd3f7fb70d836d56fe1462
treed2833bea7f386c7a3e5a45e186cf0cb135649cd8
parent475acef9ed480818aab223addfff1636af0d1915
parent62f6424514991ce6104f6a8becfd58e986f993b6
Merge tag 'ux500-defconfig-soc-v5.18' of git://git./linux/kernel/git/linusw/linux-nomadik into arm/fixes

Defconfig updates for kernel v5.18:

- Refresh defconfig with new and moved options
- Add some new hardware drivers
- Activate battery charging

* tag 'ux500-defconfig-soc-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: config: u8500: Re-enable AB8500 battery charging
  ARM: config: u8500: Add some common hardware
  ARM: config: Refresh U8500 defconfig

Link: https://lore.kernel.org/r/CACRpkdY+_Go4XNzOh+Rvc24QBnUud2k-S7VQuaH5d-j71_dJog@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>