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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAl9bGQ0ACgkQa3ZZB4FH
 cJ73qQ/+P92phQIS9PZu6YlRoC/Ei4GEWtNlJJ9XC/KuW3ihcBXbKABmE6fUF5Io
 Mi0+Ag8oiBOLRkGMFbqAVHEqTU10hnY+dkFGSsasBIOChHlRruuknf1edbb2PAPC
 6TFptq+Z1YlKHQfvCOjeSwouGeomS7UX14NhCdRI7yY+7R/33Z+ivcGOmMOZ8yZc
 t1Jpfe80R0Jrkz+3h6DoER2r2n0wvTIMzRvrV4nLCotcE9wkCMCG4UN5+XzOenaR
 jNHYg4uKyeTDw2Ot3Zq1zP5H5v4DspheYVC1KNoSnMbe4vgYKutQItlrJWZv5Qbe
 o5X/SZsNHyO/nT3wCPK88DdieAisbwCsLJbNUhcwAVqEZoLXD8mhjQeTcJ/u86RE
 DCJFtWtJ20sHERUCpUmxw7O8zJxaKsmftN6wOSVQ6IVZMDNvIqJWXm33p4XC0/M2
 M7xQ38TMHg0rwp332Gw9T5qa6fDwX79hmpoP+FPhEZN6dRl0uHPfTG8dJ9cW11N/
 dxbI43sUnwTl09RyJh6cgVuJNyR1a0yxzJ2OC2OTkWvODUyyvUsJEgep2YfF9F2G
 EqeGmhjqFwGDenEQgWwYPMDkTG6aP5dTqWoNuHsdrjo0f3tHUxRglAk4kjHR/4mN
 ZLtliwCJjXpWcl9VOmjG9tSOX3dx0XqoSwtiHbMEP4JjYsh8ls8=
 =GvTE
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-5.10-defconfig' of git://git.kernel.org/pub/scm/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>
This commit is contained in:
Olof Johansson 2020-09-13 11:31:53 -07:00
commit ce726b672b
2 changed files with 8 additions and 2 deletions

View File

@ -160,7 +160,8 @@ CONFIG_SENSORS_TMP421=y
CONFIG_SENSORS_W83773G=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ASPEED=y
CONFIG_DRM=y

View File

@ -128,6 +128,8 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_GPIO_POLLED=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_IBM_PANEL=y
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
@ -147,10 +149,12 @@ CONFIG_HW_RANDOM_TIMERIOMEM=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_GPIO=y
CONFIG_I2C_MUX_PCA9541=y
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_ASPEED=y
CONFIG_I2C_FSI=y
CONFIG_I2C_SLAVE=y
CONFIG_SPI=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
@ -175,7 +179,8 @@ CONFIG_SENSORS_TMP421=y
CONFIG_SENSORS_W83773G=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ASPEED=y
CONFIG_DRM=y