From: Arnd Bergmann Date: Fri, 25 Feb 2022 19:32:28 +0000 (+0100) Subject: Merge tag 'renesas-arm-defconfig-for-v5.18-tag1' of git://git.kernel.org/pub/scm... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0917b5bdbe4bfb7927d8dc2c1939f6736d561644;p=uclinux-h8%2Flinux.git Merge tag 'renesas-arm-defconfig-for-v5.18-tag1' of git://git./linux/kernel/git/geert/renesas-devel into arm/defconfig Renesas ARM defconfig updates for v5.18 - Enable the new Audio Graph Card2 driver which can handle sound cards more flexibly in the arm64 defconfig, - Disable unneeded 8250 serial options in shmobile_defconfig, - Enable additional support for Renesas platforms in the arm64 defconfig. * tag 'renesas-arm-defconfig-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable additional support for Renesas platforms ARM: shmobile: defconfig: Disable unneeded 8250 serial options arm64: defconfig: Enable Audio Graph Card2 driver Link: https://lore.kernel.org/r/cover.1644587198.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann --- 0917b5bdbe4bfb7927d8dc2c1939f6736d561644 diff --cc arch/arm64/configs/defconfig index 082874839f0f,46ccecad89c5..8b5ffffe8812 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -601,8 -602,8 +603,9 @@@ CONFIG_IMX_SC_WDT= CONFIG_QCOM_WDT=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m +CONFIG_ARM_SMC_WATCHDOG=y CONFIG_RENESAS_WDT=y + CONFIG_RENESAS_RZG2LWDT=y CONFIG_UNIPHIER_WATCHDOG=y CONFIG_BCM2835_WDT=y CONFIG_MFD_ALTERA_SYSMGR=y