diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2014-02-26 21:28:18 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-03-05 10:40:52 +0800 |
| commit | afc51f4643063c4285f713a27bb39077b1ef1ed3 (patch) | |
| tree | 6facdf18e3dbc5f0bb70170202865945fdea32cd /arch | |
| parent | facadba6a12813d8bbc5586261d873fa5f3dd4fa (diff) | |
ARM: imx6: call suspend_set_ops() from suspend routine
Rename function imx6q_ocram_suspend_init() to imx6q_suspend_init() and
call suspend_set_ops() from there. Now we get a centralized function
for suspend initialization.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6q.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index a9a187d54e6..2473ad4db81 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -382,8 +382,7 @@ out: return ret; } -static int __init imx6q_ocram_suspend_init(const struct imx6_pm_socdata - *socdata) +static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) { phys_addr_t ocram_pbase; struct device_node *node; @@ -394,6 +393,8 @@ static int __init imx6q_ocram_suspend_init(const struct imx6_pm_socdata int i, ret = 0; const u32 *mmdc_offset_array; + suspend_set_ops(&imx6q_pm_ops); + if (!socdata) { pr_warn("%s: invalid argument!\n", __func__); return -EINVAL; @@ -515,9 +516,9 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata WARN_ON(!ccm_base); - ret = imx6q_ocram_suspend_init(socdata); + ret = imx6q_suspend_init(socdata); if (ret) - pr_warn("%s: failed to initialize ocram suspend %d!\n", + pr_warn("%s: No DDR LPM support with suspend %d!\n", __func__, ret); /* @@ -531,9 +532,6 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata if (!IS_ERR(gpr)) regmap_update_bits(gpr, IOMUXC_GPR1, IMX6Q_GPR1_GINT, IMX6Q_GPR1_GINT); - - - suspend_set_ops(&imx6q_pm_ops); } void __init imx6q_pm_init(void) |