diff --git a/drivers/soc/rockchip/rockchip_pm_config.c b/drivers/soc/rockchip/rockchip_pm_config.c
index fba2882bd69a..c9ed5d576db0 100644
--- a/drivers/soc/rockchip/rockchip_pm_config.c
+++ b/drivers/soc/rockchip/rockchip_pm_config.c
@@ -25,8 +25,8 @@
 #define PM_INVALID_GPIO			0xffff
 #define MAX_ON_OFF_REG_NUM		30
 #define MAX_ON_OFF_REG_PROP_NAME_LEN	60
+#define MAX_CONFIG_PROP_NAME_LEN	60
 
-#ifndef MODULE
 enum rk_pm_state {
 	RK_PM_MEM = 0,
 	RK_PM_MEM_LITE,
@@ -34,6 +34,7 @@ enum rk_pm_state {
 	RK_PM_STATE_MAX
 };
 
+#ifndef MODULE
 static const char * const pm_state_str[RK_PM_STATE_MAX] = {
 	[RK_PM_MEM] = "mem",
 	[RK_PM_MEM_LITE] = "mem-lite",
@@ -46,6 +47,11 @@ static struct rk_on_off_regulator_list {
 } on_off_regs_list[RK_PM_STATE_MAX];
 #endif
 
+static struct rk_sleep_config {
+	u32 mode_config;
+	u32 wakeup_config;
+} sleep_config[RK_PM_STATE_MAX];
+
 static const struct of_device_id pm_match_table[] = {
 	{ .compatible = "rockchip,pm-px30",},
 	{ .compatible = "rockchip,pm-rk1808",},
@@ -79,6 +85,37 @@ static void rockchip_pm_virt_pwroff_prepare(void)
 	sip_smc_virtual_poweroff();
 }
 
+static int parse_sleep_config(struct device_node *node, enum rk_pm_state state)
+{
+	char mode_prop_name[MAX_CONFIG_PROP_NAME_LEN];
+	char wkup_prop_name[MAX_CONFIG_PROP_NAME_LEN];
+	struct rk_sleep_config *config;
+
+	if (state == RK_PM_MEM || state >= RK_PM_STATE_MAX)
+		return -EINVAL;
+
+	snprintf(mode_prop_name, sizeof(mode_prop_name),
+		 "sleep-mode-config-%s", pm_state_str[state]);
+	snprintf(wkup_prop_name, sizeof(wkup_prop_name),
+		 "wakeup-config-%s", pm_state_str[state]);
+
+	config = &sleep_config[state];
+
+	if (of_property_read_u32_array(node,
+				       mode_prop_name,
+				       &config->mode_config, 1))
+		pr_info("%s not set sleep-mode-config for %s\n",
+			node->name, pm_state_str[state]);
+
+	if (of_property_read_u32_array(node,
+				       wkup_prop_name,
+				       &config->wakeup_config, 1))
+		pr_info("%s not set wakeup-config for %s\n",
+			node->name, pm_state_str[state]);
+
+	return 0;
+}
+
 static int parse_regulator_list(struct device_node *node,
 				char *prop_name,
 				struct regulator_dev **out_list)
@@ -132,8 +169,7 @@ static int pm_config_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match_id;
 	struct device_node *node;
-	u32 mode_config = 0;
-	u32 wakeup_config = 0;
+	struct rk_sleep_config *config = &sleep_config[RK_PM_MEM];
 	u32 pwm_regulator_config = 0;
 	int gpio_temp[10];
 	u32 sleep_debug_en = 0;
@@ -160,17 +196,17 @@ static int pm_config_probe(struct platform_device *pdev)
 
 	if (of_property_read_u32_array(node,
 				       "rockchip,sleep-mode-config",
-				       &mode_config, 1))
+				       &config->mode_config, 1))
 		dev_warn(&pdev->dev, "not set sleep mode config\n");
 	else
-		sip_smc_set_suspend_mode(SUSPEND_MODE_CONFIG, mode_config, 0);
+		sip_smc_set_suspend_mode(SUSPEND_MODE_CONFIG, config->mode_config, 0);
 
 	if (of_property_read_u32_array(node,
 				       "rockchip,wakeup-config",
-				       &wakeup_config, 1))
+				       &config->wakeup_config, 1))
 		dev_warn(&pdev->dev, "not set wakeup-config\n");
 	else
-		sip_smc_set_suspend_mode(WKUP_SOURCE_CONFIG, wakeup_config, 0);
+		sip_smc_set_suspend_mode(WKUP_SOURCE_CONFIG, config->wakeup_config, 0);
 
 	if (of_property_read_u32_array(node,
 				       "rockchip,pwm-regulator-config",
@@ -229,8 +265,10 @@ static int pm_config_probe(struct platform_device *pdev)
 	    virtual_poweroff_en)
 		pm_power_off_prepare = rockchip_pm_virt_pwroff_prepare;
 
-	for (i = RK_PM_MEM; i < RK_PM_STATE_MAX; i++)
+	for (i = RK_PM_MEM; i < RK_PM_STATE_MAX; i++) {
+		parse_sleep_config(node, i);
 		parse_on_off_regulator(node, i);
+	}
 #endif
 
 	return 0;
@@ -244,6 +282,7 @@ static int pm_config_prepare(struct device *dev)
 	enum rk_pm_state state = suspend_state - PM_SUSPEND_MEM;
 	struct regulator_dev **on_list;
 	struct regulator_dev **off_list;
+	struct rk_sleep_config *config, *def_config = &sleep_config[RK_PM_MEM];
 
 	sip_smc_set_suspend_mode(LINUX_PM_STATE,
 				 suspend_state,
@@ -252,6 +291,22 @@ static int pm_config_prepare(struct device *dev)
 	if (state >= RK_PM_STATE_MAX)
 		return 0;
 
+	config = &sleep_config[state];
+
+	if (config->mode_config)
+		sip_smc_set_suspend_mode(SUSPEND_MODE_CONFIG,
+					 config->mode_config, 0);
+	else if (def_config->mode_config)
+		sip_smc_set_suspend_mode(SUSPEND_MODE_CONFIG,
+					 def_config->mode_config, 0);
+
+	if (config->wakeup_config)
+		sip_smc_set_suspend_mode(WKUP_SOURCE_CONFIG,
+					 config->wakeup_config, 0);
+	else if (def_config->wakeup_config)
+		sip_smc_set_suspend_mode(WKUP_SOURCE_CONFIG,
+					 def_config->wakeup_config, 0);
+
 	on_list = on_off_regs_list[state].on_reg_list;
 	off_list = on_off_regs_list[state].off_reg_list;