Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull non-critical ARM SoC bug fixes from Arnd Bergmann:
 "Bug fixes that did not make it into v3.8, mostly because they were not
  considered important enough, and in some cases because bugs only show
  up in combination with other patches destined for 3.9.  This includes
  a few larger patches for GPIO on the Marvell PXA platform and a lot of
  Samsung specific bug fixes, as well as a series from Arnd to fix older
  build warnings."

* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: SPEAr13xx: Enable CONFIG_ARCH_HAS_CPUFREQ
  ARM: imx: MACH_MX31ADS_WM1133_EV1 needs REGULATOR_WM8350
  scripts/sortextable: silence script output
  ARM: s3c: i2c: add platform_device forward declaration
  ARM: mvebu: allow selecting mvebu without Armada XP
  ARM: pick Versatile by default for !MMU
  ARM: integrator: fix build with INTEGRATOR_AP off
  ARM: integrator/versatile: fix NOMMU warnings
  ARM: sa1100: don't warn about mach/ide.h
  ARM: shmobile: fix defconfig warning on CONFIG_USB
  ARM: w90x900: fix legacy assembly syntax
  ARM: samsung: fix assembly syntax for new gas
  ARM: disable virt_to_bus/virt_to_bus almost everywhere
  ARM: dts: Correct pin configuration of SD 4 for exynos4x12-pinctrl
  ARM: SAMSUNG: Silence empty switch warning in fimc-core.h
  ARM: SAMSUNG: Silence empty switch warning in sdhci.h
  ARM: msm: proc_comm_boot_wait should not be __init
  arm: vt8500: Update MAINTAINERS entry for arch-vt8500
  ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
  ARM: S5PV210: Fix early uart output in fifo mode
  ...

2 files changed, 10 insertions, 6 deletions

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 1a89824a5f78..0c7e3ad7ba93 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -299,6 +299,7 @@ void exynos4_restart(char mode, const char *cmd)
 
 void exynos5_restart(char mode, const char *cmd)
 {
+        struct device_node *np;
         u32 val;
         void __iomem *addr;
 
@@ -306,8 +307,9 @@ void exynos5_restart(char mode, const char *cmd)
                 val = 0x1;
                 addr = EXYNOS_SWRESET;
         } else if (of_machine_is_compatible("samsung,exynos5440")) {
-                val = (0x10 << 20) | (0x1 << 16);
-                addr = EXYNOS5440_SWRESET;
+                np = of_find_compatible_node(NULL, NULL, "samsung,exynos5440-clock");
+                addr = of_iomap(np, 0) + 0xcc;
+                val = (0xfff << 20) | (0x1 << 16);
         } else {
                 pr_err("%s: cannot support non-DT\n", __func__);
                 return;
@@ -1031,8 +1033,8 @@ static int __init exynos_init_irq_eint(void)
          * interrupt support code here can be completely removed.
          */
         static const struct of_device_id exynos_pinctrl_ids[] = {
-                { .compatible = "samsung,pinctrl-exynos4210", },
-                { .compatible = "samsung,pinctrl-exynos4x12", },
+                { .compatible = "samsung,exynos4210-pinctrl", },
+                { .compatible = "samsung,exynos4x12-pinctrl", },
         };
         struct device_node *pctrl_np, *wkup_np;
         const char *wkup_compat = "samsung,exynos4210-wakeup-eint";
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index b9b539cac81e..5106ab83e593 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -91,8 +91,8 @@ static int exynos_cpu_suspend(unsigned long arg)
         /* issue the standby signal into the pm unit. */
         cpu_do_idle();
 
-        /* we should never get past here */
-        panic("sleep resumed to originator?");
+        pr_info("Failed to suspend the system\n");
+        return 1; /* Aborting suspend */
 }
 
 static void exynos_pm_prepare(void)
@@ -282,6 +282,8 @@ static void exynos_pm_resume(void)
         if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {
                 tmp |= S5P_CENTRAL_LOWPWR_CFG;
                 __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+                /* clear the wakeup state register */
+                __raw_writel(0x0, S5P_WAKEUP_STAT);
                 /* No need to perform below restore code */
                 goto early_wakeup;
         }