---
 drivers/firmware/imx/scu-pd.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c
index 53b49ef20014..b3848080db75 100644
--- a/drivers/firmware/imx/scu-pd.c
+++ b/drivers/firmware/imx/scu-pd.c

@@ -86,6 +86,7 @@ struct imx_sc_pd_soc {
 	u8 num_ranges;
 };

+int imx_con_rsrc;
 bool imx_scu_pd_initialized;

 /*

@@ -209,6 +210,23 @@ to_imx_sc_pd(struct generic_pm_domain *genpd)
 	return container_of(genpd, struct imx_sc_pm_domain, pd);  }

+static void imx_sc_pd_get_console_rsrc(void) {
+	struct of_phandle_args specs;
+	int ret;
+
+	if (!of_stdout)
+		return;
+
+	ret = of_parse_phandle_with_args(of_stdout, "power-domains",
+					 "#power-domain-cells",
+					 0, &specs);
+	if (ret)
+		return;
+
+	imx_con_rsrc = specs.args[0];
+}
+
 static int imx_sc_pd_power(struct generic_pm_domain *domain, bool

power_on)  {
 	struct imx_sc_msg_req_set_resource_power_mode msg; @@ -269,6
+287,7 @@ imx_scu_add_pm_domain(struct device *dev, int idx,
 		      const struct imx_sc_pd_range *pd_ranges)  {
 	struct imx_sc_pm_domain *sc_pd;
+	bool is_off = true;
 	int ret;

 	if (!imx_sc_rm_is_resource_owned(pm_ipc_handle, pd_ranges->rsrc + idx))

@@ -290,6 +309,10 @@ imx_scu_add_pm_domain(struct device *dev, int idx,
 			 "%s", pd_ranges->name);

 	sc_pd->pd.name = sc_pd->name;
+	if (imx_con_rsrc == sc_pd->rsrc) {
+		sc_pd->pd.flags = GENPD_FLAG_RPM_ALWAYS_ON;
+		is_off = false;
+	}

 	if (sc_pd->rsrc >= IMX_SC_R_LAST) {
 		dev_warn(dev, "invalid pd %s rsrc id %d found", @@ -299,7 +322,7

@@ imx_scu_add_pm_domain(struct device *dev, int idx,
 		return NULL;
 	}

-	ret = pm_genpd_init(&sc_pd->pd, NULL, true);
+	ret = pm_genpd_init(&sc_pd->pd, NULL, is_off);
 	if (ret) {
 		dev_warn(dev, "failed to init pd %s rsrc id %d",
 			 sc_pd->name, sc_pd->rsrc);

@@ -365,6 +388,8 @@ static int imx_sc_pd_probe(struct platform_device

*pdev)
 	if (!pd_soc)
 		return -ENODEV;

+	imx_sc_pd_get_console_rsrc();
+
 	ret = imx_scu_init_pm_domains(&pdev->dev, pd_soc);
 	if (!ret)
 		imx_scu_pd_initialized = true;
--
2.23.0