Skip to content

Commit 2981c62

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.14-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.14 - Enable Watchdog support for the RZ/V2H(P) SoC and the RZ/V2H EVK board in the ARM64 defconfig, - Refresh shmobile_defconfig for v6.13-rc1, - Enable support for the Renesas RZ/G3E (R9A09G047) SoC in the ARM64 defconfig. * tag 'renesas-arm-defconfig-for-v6.14-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable R9A09G047 SoC ARM: shmobile: defconfig: Refresh for v6.13-rc1 arm64: defconfig: Enable Renesas RZ/V2H(P) Watchdog driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1608251 + a40f02b commit 2981c62

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ CONFIG_DW_DMAC=y
192192
CONFIG_RZN1_DMAMUX=y
193193
CONFIG_RCAR_DMAC=y
194194
CONFIG_RENESAS_USB_DMAC=y
195+
CONFIG_RZ_DMAC=y
195196
# CONFIG_IOMMU_SUPPORT is not set
196197
CONFIG_ARCH_EMEV2=y
197198
CONFIG_ARCH_R8A7794=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ CONFIG_MESON_WATCHDOG=m
738738
CONFIG_ARM_SMC_WATCHDOG=y
739739
CONFIG_RENESAS_WDT=y
740740
CONFIG_RENESAS_RZG2LWDT=y
741+
CONFIG_RENESAS_RZV2HWDT=y
741742
CONFIG_UNIPHIER_WATCHDOG=y
742743
CONFIG_PM8916_WATCHDOG=m
743744
CONFIG_BCM2835_WDT=y
@@ -1457,6 +1458,7 @@ CONFIG_ARCH_R9A07G044=y
14571458
CONFIG_ARCH_R9A07G054=y
14581459
CONFIG_ARCH_R9A08G045=y
14591460
CONFIG_ARCH_R9A09G011=y
1461+
CONFIG_ARCH_R9A09G047=y
14601462
CONFIG_ARCH_R9A09G057=y
14611463
CONFIG_ROCKCHIP_IODOMAIN=y
14621464
CONFIG_ARCH_TEGRA_132_SOC=y

0 commit comments

Comments
 (0)