From 8ba5ad5e94389236c6ba854aa16ddaa459ccd432 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 10 Sep 2020 09:58:08 +0930 Subject: linux-aspeed: IBM op panel, I2C slave mode Enable I2C slave mode in ast2500 and ast2600 kernel config. Eddie James (5): dt-bindings: input: Add documentation for IBM Operation Panel input: misc: Add IBM Operation Panel driver i2c: aspeed: Mask IRQ status to relevant bits ARM: dts: aspeed: tacoma: Add IBM Operation Panel I2C device ARM: dts: aspeed: rainier: Add IBM Operation Panel I2C device (From meta-aspeed rev: 6204d930bc5b9df98192843227abac29946f75df) Change-Id: I2b66eb5192fabb8562af2327ef5afe3ef3fc33d9 Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 3 +++ meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 3 +++ meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 1a56ff7a5..459a40dd7 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -125,6 +125,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 @@ -148,6 +150,7 @@ 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 diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index 040a2392e..b80042396 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -137,6 +137,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 @@ -162,6 +164,7 @@ 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_SPI_FSI=y CONFIG_GPIOLIB=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index b0e977952..2b9f018bf 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.8" LINUX_VERSION ?= "5.8.5" -SRCREV="0dd0c8c492fa70707ca4f0d36dcb2e3c64105b16" +SRCREV="c152f081cb5776ae6ab76b0fe7d4ad052f229319" require linux-aspeed.inc -- cgit v1.2.3