summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-imx/pm-imx6.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 8fd1f7188725..42594e7046b7 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -1353,7 +1353,6 @@ void __init imx6q_pm_init(void)
imx6_pm_common_init(&imx6q_lpddr2_pm_data);
else
imx6_pm_common_init(&imx6q_pm_data);
-#ifndef CONFIG_POWER_RESET_GPIO
/*
* if no specific power off function in board file, power off system by
* stop mode
@@ -1361,14 +1360,12 @@ void __init imx6q_pm_init(void)
if (!pm_power_off)
if (of_machine_is_compatible("toradex,apalis_imx6q"))
pm_power_off = imx6_stop_mode_poweroff;
-#endif
}
void __init imx6dl_pm_init(void)
{
imx6_pm_common_init(&imx6dl_pm_data);
-#ifndef CONFIG_POWER_RESET_GPIO
/*
* if no specific power off function in board file, power off system by
* stop mode
@@ -1376,7 +1373,6 @@ void __init imx6dl_pm_init(void)
if (!pm_power_off)
if (of_machine_is_compatible("toradex,colibri_imx6dl"))
pm_power_off = imx6_stop_mode_poweroff;
-#endif
}
void __init imx6sl_pm_init(void)