Suspend: Introduce begin() and end() callbacks

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 52xx / lite5200_pm.c

diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
index c3ada1e340d255ab05f8c711bb02545fd768af47..41c7fd91e99e5836cbaef5c7d6803334bc37a206 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -31,7 +31,7 @@ static int lite5200_pm_valid(suspend_state_t state)
        }
 }
 
-static int lite5200_pm_set_target(suspend_state_t state)
+static int lite5200_pm_begin(suspend_state_t state)
 {
        if (lite5200_pm_valid(state)) {
                lite5200_pm_target_state = state;
@@ -43,6 +43,13 @@ static int lite5200_pm_set_target(suspend_state_t state)
 static int lite5200_pm_prepare(void)
 {
        struct device_node *np;
+       const struct of_device_id immr_ids[] = {
+               { .compatible = "fsl,mpc5200-immr", },
+               { .compatible = "fsl,mpc5200b-immr", },
+               { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */
+               { .type = "builtin", .compatible = "mpc5200", }, /* efika */
+               {}
+       };
 
        /* deep sleep? let mpc52xx code handle that */
        if (lite5200_pm_target_state == PM_SUSPEND_STANDBY)
@@ -52,7 +59,7 @@ static int lite5200_pm_prepare(void)
                return -EINVAL;
 
        /* map registers */
-       np = of_find_compatible_node(NULL, NULL, "mpc5200");
+       np = of_find_matching_node(NULL, immr_ids);
        mbar = of_iomap(np, 0);
        of_node_put(np);
        if (!mbar) {
@@ -212,12 +219,18 @@ static void lite5200_pm_finish(void)
                mpc52xx_pm_finish();
 }
 
+static void lite5200_pm_end(void)
+{
+       lite5200_pm_target_state = PM_SUSPEND_ON;
+}
+
 static struct platform_suspend_ops lite5200_pm_ops = {
        .valid          = lite5200_pm_valid,
-       .set_target     = lite5200_pm_set_target,
+       .begin          = lite5200_pm_begin,
        .prepare        = lite5200_pm_prepare,
        .enter          = lite5200_pm_enter,
        .finish         = lite5200_pm_finish,
+       .end            = lite5200_pm_end,
 };
 
 int __init lite5200_pm_init(void)