diff options
author | 2022-07-01 22:24:46 +0200 | |
---|---|---|
committer | 2022-07-01 22:24:47 +0200 | |
commit | 89a24d7d85bd4b5899d5a4bb63e56a30e5984300 (patch) | |
tree | c9a653201c0aedec632cbe7105145112aaf62719 | |
parent | Linux 5.19-rc4 (diff) | |
parent | arm64: defconfig: Enable R8A779G0 SoC (diff) | |
download | linux-dev-89a24d7d85bd4b5899d5a4bb63e56a30e5984300.tar.xz linux-dev-89a24d7d85bd4b5899d5a4bb63e56a30e5984300.zip |
Merge tag 'renesas-arm-defconfig-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v5.20
- Enable support for the Renesas R-Car V4H SoC,
- Refresh shmobile_defconfig for v5.19-rc1.
* tag 'renesas-arm-defconfig-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
arm64: defconfig: Enable R8A779G0 SoC
ARM: shmobile: defconfig: Refresh for v5.19-rc1
Link: https://lore.kernel.org/r/cover.1656069632.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/configs/shmobile_defconfig | 4 | ||||
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 362643cbeffd..a29bebb3742e 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -6,7 +6,6 @@ CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_PERF_EVENTS=y -CONFIG_SLAB=y CONFIG_ARCH_RENESAS=y CONFIG_PL310_ERRATA_588369=y CONFIG_SMP=y @@ -25,6 +24,7 @@ CONFIG_CPUFREQ_DT=y CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_SLAB=y CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y @@ -106,6 +106,7 @@ CONFIG_WATCHDOG=y CONFIG_DA9063_WATCHDOG=y CONFIG_RENESAS_WDT=y CONFIG_RENESAS_RZAWDT=y +CONFIG_RENESAS_RZN1WDT=y CONFIG_MFD_AS3711=y CONFIG_MFD_DA9063=y CONFIG_MFD_STMPE=y @@ -177,6 +178,7 @@ CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_RX8581=y CONFIG_RTC_DRV_DA9063=y CONFIG_RTC_DRV_SH=y +CONFIG_RTC_DRV_RZN1=y CONFIG_DMADEVICES=y CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7d1105343bc2..c8cbb98ea6bc 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1119,6 +1119,7 @@ CONFIG_ARCH_R8A779F0=y CONFIG_ARCH_R8A77980=y CONFIG_ARCH_R8A77970=y CONFIG_ARCH_R8A779A0=y +CONFIG_ARCH_R8A779G0=y CONFIG_ARCH_R8A774C0=y CONFIG_ARCH_R8A774E1=y CONFIG_ARCH_R8A774A1=y |