diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-12-20 19:58:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-12-20 19:58:56 +0300 |
| commit | 2981c62fb6542cf84e5e5eabb40949cd2d038603 (patch) | |
| tree | cf3b061582eeeac07ff989e675f96c033771cec9 | |
| parent | 160825131614bbf0afaee837180391e313d9d08b (diff) | |
| parent | a40f02b2923b6d58e76cfef760b8ed61a00f1d53 (diff) | |
| download | linux-2981c62fb6542cf84e5e5eabb40949cd2d038603.tar.xz | |
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/cover.1734689799.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 0e380e450a62..fd28f3176c6b 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -192,6 +192,7 @@ CONFIG_DW_DMAC=y CONFIG_RZN1_DMAMUX=y CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=y +CONFIG_RZ_DMAC=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_ARCH_EMEV2=y CONFIG_ARCH_R8A7794=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b48940b3d100..5ee6cb7408bd 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -738,6 +738,7 @@ CONFIG_MESON_WATCHDOG=m CONFIG_ARM_SMC_WATCHDOG=y CONFIG_RENESAS_WDT=y CONFIG_RENESAS_RZG2LWDT=y +CONFIG_RENESAS_RZV2HWDT=y CONFIG_UNIPHIER_WATCHDOG=y CONFIG_PM8916_WATCHDOG=m CONFIG_BCM2835_WDT=y @@ -1457,6 +1458,7 @@ CONFIG_ARCH_R9A07G044=y CONFIG_ARCH_R9A07G054=y CONFIG_ARCH_R9A08G045=y CONFIG_ARCH_R9A09G011=y +CONFIG_ARCH_R9A09G047=y CONFIG_ARCH_R9A09G057=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_ARCH_TEGRA_132_SOC=y |