Merge tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux...

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 <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index 0788fc2520620cf50e8dc44771566141a6755f08,ea0634c7fe7deab7fde662575c7905995d7c5b2e..e5700421603bd37e21d1db54b6c670872f1c73e6
--- 1/arch/arm64/configs/defconfig
--- 2/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