Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/mach-s3c/pm.c
similarity index 94%
rename from arch/arm/plat-samsung/pm.c
rename to arch/arm/mach-s3c/pm.c
index d6bfd66592b04f094742eeb177077f6b17ccc8bf..c563bb9d92be0e2eafc20a18a388002d2911cf7f 100644 (file)
--- a/arch/arm/plat-samsung/pm.c
+++ b/arch/arm/mach-s3c/pm.c
@@ -18,15 +18,16 @@
 #include <asm/cacheflush.h>
 #include <asm/suspend.h>
 
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/regs-irq.h>
+#include "map.h"
+#include "regs-clock.h"
+#include "regs-irq.h"
 #include <mach/irqs.h>
 
 #include <asm/irq.h>
 
-#include <plat/pm.h>
-#include <mach/pm-core.h>
+#include "cpu.h"
+#include "pm.h"
+#include "pm-core.h"
 
 /* for external use */
 
@@ -70,8 +71,7 @@ static int s3c_pm_enter(suspend_state_t state)
 {
        int ret;
        /* ensure the debug is initialised (if enabled) */
-
-       s3c_pm_debug_init();
+       s3c_pm_debug_init_uart();
 
        S3C_PMDBG("%s(%d)\n", __func__, state);
 
@@ -100,7 +100,7 @@ static int s3c_pm_enter(suspend_state_t state)
                samsung_pm_saved_gpios();
        }
 
-       s3c_pm_save_uarts();
+       s3c_pm_save_uarts(soc_is_s3c2410());
        s3c_pm_save_core();
 
        /* set the irq configuration for wake */
@@ -137,14 +137,14 @@ static int s3c_pm_enter(suspend_state_t state)
        /* restore the system state */
 
        s3c_pm_restore_core();
-       s3c_pm_restore_uarts();
+       s3c_pm_restore_uarts(soc_is_s3c2410());
 
        if (!of_have_populated_dt()) {
                samsung_pm_restore_gpios();
                s3c_pm_restored_gpios();
        }
 
-       s3c_pm_debug_init();
+       s3c_pm_debug_init_uart();
 
        /* check what irq (if any) restored the system */