Merge tag 'v5.12-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel...

Enable REGULATOR_MP8859 - the main power supply for one Rockchip board.

* tag 'v5.12-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: defconfig: Enable REGULATOR_MP8859

Link: https://lore.kernel.org/r/4622596.31r3eYUQgx@phil
Signed-off-by: Arnd Bergmann <[email protected]>

diff --cc arch/arm64/configs/defconfig
index 332cae973a0444920e04a82d4b894c23d7ec828d,033c67b8fdfba607e99ef35e4070b2b6d49ab56a..cc72798232164a6f1bc98e9be090ea7c4000bf3a
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -610,8 -602,8 +610,9 @@@ CONFIG_REGULATOR_HI6421V530=
  CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_MAX77620=y
  CONFIG_REGULATOR_MAX8973=y
+ CONFIG_REGULATOR_MP8859=y
  CONFIG_REGULATOR_PCA9450=y
 +CONFIG_REGULATOR_PF8X00=y
  CONFIG_REGULATOR_PFUZE100=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_QCOM_RPMH=y