Merge tag 'vfio-v4.20-rc1.v2' of git://github.com/awilliam/linux-vfio

[sfrench/cifs-2.6.git] / arch / arm / mach-imx / pm-imx6.c

diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index b08e407d8d96f4f7a61d107ee877a64571a8acaf..87f45b926c78d50bd820bfab0fe874f966b16425 100644 (file)
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -313,7 +313,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode)
                if (cpu_is_imx6sl())
                        val |= BM_CLPCR_BYPASS_PMIC_READY;
                if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul() ||
-                   cpu_is_imx6ull() || cpu_is_imx6sll())
+                   cpu_is_imx6ull() || cpu_is_imx6sll() || cpu_is_imx6ulz())
                        val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;
                else
                        val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;
@@ -331,7 +331,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode)
                if (cpu_is_imx6sl() || cpu_is_imx6sx())
                        val |= BM_CLPCR_BYPASS_PMIC_READY;
                if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul() ||
-                   cpu_is_imx6ull() || cpu_is_imx6sll())
+                   cpu_is_imx6ull() || cpu_is_imx6sll() || cpu_is_imx6ulz())
                        val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;
                else
                        val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;
@@ -618,6 +618,28 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
                                   IMX6Q_GPR1_GINT);
 }
 
+static void imx6_pm_stby_poweroff(void)
+{
+       imx6_set_lpm(STOP_POWER_OFF);
+       imx6q_suspend_finish(0);
+
+       mdelay(1000);
+
+       pr_emerg("Unable to poweroff system\n");
+}
+
+static int imx6_pm_stby_poweroff_probe(void)
+{
+       if (pm_power_off) {
+               pr_warn("%s: pm_power_off already claimed  %p %pf!\n",
+                       __func__, pm_power_off, pm_power_off);
+               return -EBUSY;
+       }
+
+       pm_power_off = imx6_pm_stby_poweroff;
+       return 0;
+}
+
 void __init imx6_pm_ccm_init(const char *ccm_compat)
 {
        struct device_node *np;
@@ -634,6 +656,9 @@ void __init imx6_pm_ccm_init(const char *ccm_compat)
        val = readl_relaxed(ccm_base + CLPCR);
        val &= ~BM_CLPCR_LPM;
        writel_relaxed(val, ccm_base + CLPCR);
+
+       if (of_property_read_bool(np, "fsl,pmic-stby-poweroff"))
+               imx6_pm_stby_poweroff_probe();
 }
 
 void __init imx6q_pm_init(void)