summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/aspeed_g4_defconfig
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2017-08-23 15:57:34 +0930
committerJoel Stanley <joel@jms.id.au>2017-08-23 16:04:42 +0930
commit652213cd1081017e2139d57b6c7871670e41bf0b (patch)
tree49319906be6e7f5727342aa814e7512006e782b3 /arch/arm/configs/aspeed_g4_defconfig
parentea1ef2242c3273e94edc73b4c01a0416c2048476 (diff)
downloadlinux-652213cd1081017e2139d57b6c7871670e41bf0b.tar.gz
linux-652213cd1081017e2139d57b6c7871670e41bf0b.tar.bz2
linux-652213cd1081017e2139d57b6c7871670e41bf0b.zip
ARM: config: aspeed: Add I2C, VUART, LPC Snoop
These drivers have been recently upstreamed, so add them to the defconfigs. Acked-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm/configs/aspeed_g4_defconfig')
-rw-r--r--arch/arm/configs/aspeed_g4_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
index 39bd634b8c47..d23b9d56a88b 100644
--- a/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -65,6 +65,7 @@ CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_BLK_DEV_RAM=y
CONFIG_ASPEED_LPC_CTRL=y
+CONFIG_ASPEED_LPC_SNOOP=y
CONFIG_EEPROM_AT24=y
CONFIG_NETDEVICES=y
CONFIG_NETCONSOLE=y
@@ -105,6 +106,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=6
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_ASPEED_VUART=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_ASPEED_BT_IPMI_BMC=y
@@ -115,6 +117,7 @@ CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA9541=y
CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_ASPEED=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_ASPEED=y
@@ -167,7 +170,6 @@ CONFIG_PRINTK_TIME=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_STRIP_ASM_SYMS=y
CONFIG_DEBUG_FS=y
-CONFIG_LOCKUP_DETECTOR=y
CONFIG_WQ_WATCHDOG=y
CONFIG_PANIC_TIMEOUT=-1
# CONFIG_SCHED_DEBUG is not set