From: Arnd Bergmann Date: Mon, 8 Feb 2021 15:40:19 +0000 (+0100) Subject: Merge tag 'v5.12-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b9f5793e1f279527e9f155a011e01cd57bccaef;p=uclinux-h8%2Flinux.git Merge tag 'v5.12-rockchip-defconfig64-1' of git://git./linux/kernel/git/mmind/linux-rockchip into arm/defconfig 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 --- 7b9f5793e1f279527e9f155a011e01cd57bccaef diff --cc arch/arm64/configs/defconfig index 332cae973a04,033c67b8fdfb..cc7279823216 --- a/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