diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-04-12 11:17:23 +0930 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-04-24 17:56:38 +0000 |
| commit | 37911c44caef94a8d6c0a908fca9c5a7fe806ddb (patch) | |
| tree | e88e75f94f548c0b3a6d4e71f1dca177fb9129dc | |
| parent | dcd339a0cd979e7dcfcbcf3f7e703a2296dd503b (diff) | |
| download | talos-openbmc-37911c44caef94a8d6c0a908fca9c5a7fe806ddb.tar.gz talos-openbmc-37911c44caef94a8d6c0a908fca9c5a7fe806ddb.zip | |
kernel: Add ASPEED AST2500 DRM driver
This updates the kernel to include the ASPEED DRM driver.
Note that the defconfig update has no affect on the I2C support; it
drops out only due to being selected by other dependencies.
Joel Stanley (6):
drm: Add ASPEED GFX driver
drm: aspeed: Debugfs interface for GFX registers
ARM: dts: aspeed-g5: Add resets and clocks to GFX node
ARM: dts: ast2500-evb: Enable the GFX IP
ARM: dts: witherspoon: Enable the GFX IP
ARM: dts: aspeed-g5: Add DAC MUX userspace control
Change-Id: I084c4df8b7d4bcc183a865c9eabb0154570e0342
Signed-off-by: Joel Stanley <joel@jms.id.au>
| -rwxr-xr-x | meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig | 3 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig index c6b68ce6b..8b7c57c18 100755 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig @@ -133,7 +133,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y -CONFIG_I2C=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y @@ -163,6 +162,8 @@ CONFIG_SENSORS_MAX31785=y CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_TMP421=y +CONFIG_DRM=y +CONFIG_DRM_ASPEED_GFX=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DYNAMIC_MINORS=y diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb index 58f248569..2d35c4a58 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.13" LINUX_VERSION ?= "4.13.16" -SRCREV="e8b7a01a0b0f611d48cdba2471ae6fbddeed17f5" +SRCREV="5b5a9c2d51eda4279915d72cda387dd6edfd00df" require linux-obmc.inc |
