From: Olof Johansson Date: Fri, 25 May 2018 12:05:23 +0000 (-0700) Subject: Merge tag 'renesas-arm64-defconfig-for-v4.18' of https://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.18-rc1~51^2^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25537b86ca77d36d6ef8d3090a4c3f7273cbb301;p=thirdparty%2Fkernel%2Flinux.git 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 --- 25537b86ca77d36d6ef8d3090a4c3f7273cbb301 diff --cc arch/arm64/configs/defconfig index 1c98939e6412d,a952346956fed..178dc02b9620b --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -294,6 -287,6 +295,7 @@@ CONFIG_SERIAL_MVEBU_UART= 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