diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 19:10:00 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 19:10:00 +0300 |
| commit | 6dc3265cfae915dfd6d2b75b879293a50640a2f5 (patch) | |
| tree | e21b7c195cd287c88575abc0c2da99e89715afc0 | |
| parent | c20f5c59aac63ea9ea2cfbb3b79d6cada4d9c8ef (diff) | |
| parent | bb58b29899ff9c6d1e97727ec05b500e832ebd7d (diff) | |
| download | linux-6dc3265cfae915dfd6d2b75b879293a50640a2f5.tar.xz | |
Merge tag 'renesas-arm64-defconfig-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM64 Based SoC Defconfig Updates for v4.15" from Simon Horman:
* Enable the following to allow further test coverage
- r8a77970 (V3M) and r8a77995 (D3) R-Car Gen3 SoCs
- R-Car Gen3 thermal driver.
This is used on a range of R-Car Gen3 SoCs
* tag 'renesas-arm64-defconfig-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: defconfig: enable R8A77970 SoC
arm64: defconfig: enable thermal driver for Renesas R-Car Gen3
arm64: defconfig: Enable Renesas R8A77995 SoC
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 34480e9af2e7..cb5b37fe1e14 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -51,6 +51,8 @@ CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_R8A7795=y CONFIG_ARCH_R8A7796=y +CONFIG_ARCH_R8A77970=y +CONFIG_ARCH_R8A77995=y CONFIG_ARCH_STRATIX10=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_SPRD=y @@ -315,6 +317,7 @@ CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_BRCMSTB_THERMAL=m CONFIG_EXYNOS_THERMAL=y +CONFIG_RCAR_GEN3_THERMAL=y CONFIG_ROCKCHIP_THERMAL=m CONFIG_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y |