Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf867842 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm64-defconfig-for-v5.1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 758cf939 b8c3667a

arch/arm64/configs/defconfig

+3 −0
Original line number Diff line number Diff line
@@ -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