Merge tag 'aspeed-5.10-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sun, 13 Sep 2020 18:31:53 +0000 (11:31 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 Sep 2020 18:31:54 +0000 (11:31 -0700)
commitce726b672b1131e75a51643031f73a72e4f6122b
treeba3e20ae186339ca0e26fe8198d3da15247d3416
parent714b348cdc0ec5f8f40410c955b78ab1009250f6
parent74976e861309e4bf7f3e7e93f56ca3a6e0e1eca9
Merge tag 'aspeed-5.10-defconfig' of git://git./linux/kernel/git/joel/aspeed into arm/defconfig

ASPEED defconfig updates for 5.10

 - Fix an issue with unwanted media drivers being enabled

 - New driver: IBM OP Panel, used on ast2600 systems. This requires
   enabling I2C slave mode

 - Enable I2C MUX GPIO driver

* tag 'aspeed-5.10-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: config: aspeed_g5: Enable IBM OP Panel driver
  ARM: config: aspeed-g5: Enable I2C GPIO mux driver
  ARM: config: aspeed: Fix selection of media drivers

Link: https://lore.kernel.org/r/CACPK8XdFE2K1_cyrg=uaD6CaOm_p0RCRmjAsu6uyFKD4rnDggQ@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>