~hc/RK356X_SDK_RELEASE.git

..	..	@@ -914,9 +914,8 @@
914	914	}
915	915
916	916	if (!i)
917		- dev_warn(dev, "Failed to enable %s%u[0x%x]\n",
918		- priv->reg_layout == CLK_REG_LAYOUT_RZ_A ?
919		- "STB" : "SMSTP", reg, oldval & mask);
	917	+ dev_warn(dev, "Failed to enable SMSTP%u[0x%x]\n", reg,
	918	+ oldval & mask);
920	919	}
921	920
922	921	return 0;
..	..	@@ -960,7 +959,6 @@
960	959	goto out_err;
961	960	}
962	961
963		- cpg_mssr_priv = priv;
964	962	priv->num_core_clks = info->num_total_core_clks;
965	963	priv->num_mod_clks = info->num_hw_mod_clks;
966	964	priv->last_dt_core_clk = info->last_dt_core_clk;
..	..	@@ -990,6 +988,8 @@
990	988	if (error)
991	989	goto out_err;
992	990
	991	+ cpg_mssr_priv = priv;
	992	+
993	993	return 0;
994	994
995	995	out_err: