summaryrefslogtreecommitdiff
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 16:50:26 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 16:50:41 +0100
commitbf86784276deb28f3c7293a7c3e212691670fd5c (patch)
tree4a24ac82a7ff81eb15eb951f8d0c9dd50838fb70 /arch/arm64/configs
parent758cf939df66a08d5d91a05a56b075484a4fc972 (diff)
parentb8c3667a892a2ef2a2a5f91dfc2e3e3f0225185e (diff)
Merge tag 'renesas-arm64-defconfig-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/defconfig
Renesas ARM64 Based SoC Defconfig Updates for v5.1 Enable: * PCM3168A support which is required for audio on Kingfisher daughterboards * R-Car thermal support * Gen3 PCIe PHY support * tag 'renesas-arm64-defconfig-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: select Kingfisher Sound related configs arm64: defconfig: Enable R-Car thermal driver arm64: defconfig: Enable CONFIG_PHY_RCAR_GEN3_PCIE Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 28070ad3b223..d4a1626c5caa 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -413,6 +413,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_RCAR_THERMAL=y
CONFIG_RCAR_GEN3_THERMAL=y
CONFIG_ARMADA_THERMAL=y
CONFIG_BCM2835_THERMAL=m
@@ -528,6 +529,7 @@ CONFIG_SND_MESON_AXG_SOUND_CARD=m
CONFIG_SND_SOC_SAMSUNG=y
CONFIG_SND_SOC_RCAR=m
CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
CONFIG_SND_SIMPLE_CARD=m
CONFIG_SND_AUDIO_GRAPH_CARD=m
CONFIG_SND_SOC_ES7134=m
@@ -717,6 +719,7 @@ CONFIG_PHY_HISI_INNO_USB2=y
CONFIG_PHY_MVEBU_CP110_COMPHY=y
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_USB_HS=y
+CONFIG_PHY_RCAR_GEN3_PCIE=y
CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_RCAR_GEN3_USB3=m
CONFIG_PHY_ROCKCHIP_EMMC=y