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

Pull ARM SoC fixes from Olof Johansson:
 - a short branch of OMAP fixes that we didn't merge before the window
   opened.
 - a small cleanup that sorts the rk3288 dts entries properly
 - a build fix due to a reference to a removed DT node on exynos

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: exynos5420: remove disp_pd
  ARM: EXYNOS: Fix suspend/resume sequences
  ARM: dts: Fix the sort ordering of EHCI and HSIC in rk3288.dtsi
  ARM: OMAP3: Fix coding style problems in arch/arm/mach-omap2/control.c
  ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case.
  ARM: OMAP2+: clock: allow omap2_dpll_round_rate() to round to next-lowest rate

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index f4796c002070..da041b4ab29c 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -280,6 +280,7 @@ void omap3_clear_scratchpad_contents(void)
         u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
         void __iomem *v_addr;
         u32 offset = 0;
+
         v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
         if (omap3xxx_prm_clear_global_cold_reset()) {
                 for ( ; offset <= max_offset; offset += 0x4)
@@ -309,7 +310,8 @@ void omap3_save_scratchpad_contents(void)
                 scratchpad_contents.public_restore_ptr =
                         virt_to_phys(omap3_restore_3630);
         else if (omap_rev() != OMAP3430_REV_ES3_0 &&
-                                        omap_rev() != OMAP3430_REV_ES3_1)
+                                        omap_rev() != OMAP3430_REV_ES3_1 &&
+                                        omap_rev() != OMAP3430_REV_ES3_1_2)
                 scratchpad_contents.public_restore_ptr =
                         virt_to_phys(omap3_restore);
         else
@@ -463,7 +465,6 @@ void omap3_control_save_context(void)
         control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
         control_context.padconf_sys_nirq =
                 omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
-        return;
 }
 
 void omap3_control_restore_context(void)
@@ -521,7 +522,6 @@ void omap3_control_restore_context(void)
         omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
         omap_ctrl_writel(control_context.padconf_sys_nirq,
                          OMAP343X_CONTROL_PADCONF_SYSNIRQ);
-        return;
 }
 
 void omap3630_ctrl_disable_rta(void)