提交 afc51f46 编写于 作者: S Shawn Guo

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: NShawn Guo <shawn.guo@linaro.org>
上级 facadba6
......@@ -382,8 +382,7 @@ static int __init imx6_pm_get_base(struct imx6_pm_base *base,
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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册