Merge branch 'CR_3121_VF2_Hibernation_mason.huo' into 'vf2-515-devel'

CR_3121 Add hibernation support for VF2

See merge request sbc/linux!60

diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
index 7ca56e5..c545421 100755 (executable)
--- a/arch/riscv/configs/starfive_visionfive2_defconfig
+++ b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -21,9 +21,11 @@ CONFIG_SOC_STARFIVE=y
 CONFIG_SOC_STARFIVE_JH7110=y
 CONFIG_SMP=y
 CONFIG_HZ_100=y
-CONFIG_PM=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION="PARTLABEL=hibernation"
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
+CONFIG_PM_TEST_SUSPEND=y
 CONFIG_CPU_IDLE=y
 CONFIG_RISCV_SBI_CPUIDLE=y
 # CONFIG_SECCOMP is not set
@@ -205,7 +207,6 @@ CONFIG_DRM_VERISILICON=y
 CONFIG_STARFIVE_INNO_HDMI=y
 CONFIG_STARFIVE_DSI=y
 CONFIG_DRM_IMG_ROGUE=y
-# CONFIG_DRM_IMG_NULLDISP is not set
 CONFIG_DRM_LEGACY=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -215,7 +216,6 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_DESIGNWARE_I2S=y
-CONFIG_SND_DESIGNWARE_I2S_STARFIVE_JH7110=y
 CONFIG_SND_SOC_STARFIVE=y
 CONFIG_SND_SOC_STARFIVE_PWMDAC=y
 CONFIG_SND_SOC_STARFIVE_I2S=y
@@ -257,7 +257,6 @@ CONFIG_DMATEST=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
 CONFIG_GOLDFISH=y
-CONFIG_CLK_STARFIVE_JH7110_PLL=y
 CONFIG_STARFIVE_TIMER=y
 CONFIG_MAILBOX=y
 CONFIG_STARFIVE_MBOX=m