From: Arnd Bergmann Date: Tue, 8 Mar 2022 15:47:00 +0000 (+0100) Subject: Merge tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux... X-Git-Tag: v5.18-rc1~148^2~8 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fd2307ee94c370be6f1f6e51feab1d0d57f10b46;p=linux-block.git Merge tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig This pull request contains Broadcom ARM64-based defconfig updates for 5.18, please pull the following: - Florian enables Broadcom STB drivers for NAND, SATA, Ethernet switch, USB PHY and host controllers, watchdog, PWM and Ethernet controller * tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux: arm64: defconfig: Enable additional Broadcom STB drivers Signed-off-by: Arnd Bergmann --- fd2307ee94c370be6f1f6e51feab1d0d57f10b46 diff --cc arch/arm64/configs/defconfig index 0788fc252062,ea0634c7fe7d..e5700421603b --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -366,8 -369,7 +370,9 @@@ CONFIG_REALTEK_PHY= CONFIG_ROCKCHIP_PHY=y CONFIG_DP83867_PHY=y CONFIG_VITESSE_PHY=y +CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y +CONFIG_MDIO_BUS_MUX_MMIOREG=y + CONFIG_USB_BRCMSTB=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m @@@ -597,7 -596,9 +602,8 @@@ CONFIG_WATCHDOG= CONFIG_SL28CPLD_WATCHDOG=m CONFIG_ARM_SP805_WATCHDOG=y CONFIG_ARM_SBSA_WATCHDOG=y -CONFIG_ARM_SMC_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y + CONFIG_BCM7038_WDT=m CONFIG_DW_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=m CONFIG_IMX2_WDT=y