summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-05-25 05:05:23 -0700
committerOlof Johansson <olof@lixom.net>2018-05-25 05:05:23 -0700
commit25537b86ca77d36d6ef8d3090a4c3f7273cbb301 (patch)
treedcfeb94837894ace5415967e352559dd4a8e0268 /arch/arm64/configs
parent445736240e1683954e308d0e7155eded13cbd9e8 (diff)
parentc1fcd2ec1b1970e0e7b0c40c64bc51cf667b1a75 (diff)
downloadop-kernel-dev-25537b86ca77d36d6ef8d3090a4c3f7273cbb301.zip
op-kernel-dev-25537b86ca77d36d6ef8d3090a4c3f7273cbb301.tar.gz
Merge tag 'renesas-arm64-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM64 Based SoC Defconfig Updates for v4.18 * Enable in ARM64 defconfig: - Recently mainlined support for R-Car E3 (r8a77990) SoC - HDMI sound and depdencies. HDMI sound is used by R-Car Gen 3. These options are enabled as modules to avoid unnecesesarily enlarging the kernel image. * tag 'renesas-arm64-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: enable R8A77990 SoC arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD arm64: defconfig: makes SND_SIMPLE_CARD to module Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 1c98939..178dc02 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -53,6 +53,7 @@ CONFIG_ARCH_R8A7796=y
CONFIG_ARCH_R8A77965=y
CONFIG_ARCH_R8A77970=y
CONFIG_ARCH_R8A77980=y
+CONFIG_ARCH_R8A77990=y
CONFIG_ARCH_R8A77995=y
CONFIG_ARCH_STRATIX10=y
CONFIG_ARCH_TEGRA=y
@@ -294,6 +295,7 @@ CONFIG_SERIAL_MVEBU_UART=y
CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
CONFIG_VIRTIO_CONSOLE=y
+CONFIG_I2C_HID=m
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y
@@ -451,8 +453,8 @@ CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_SOC_SAMSUNG=y
CONFIG_SND_SOC_RCAR=m
CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_I2C_HID=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
CONFIG_USB=y
CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
OpenPOWER on IntegriCloud