From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 4 Dec 2014 15:46:43 +0000 (+0100)
Subject: Merge tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu into next/soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab64920c3742ba992a3bf0b06f9750d1cad9d050;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu into next/soc

Pull "mvebu SoC suspend changes for v3.19" from Jason Cooper:

 - Armada 370/XP suspend/resume support

 - mvebu SoC driver suspend/resume support
    - irqchip
    - clocksource
    - mbus
    - clk

* tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add SDRAM controller description for Armada XP
  ARM: mvebu: adjust mbus controller description on Armada 370/XP
  ARM: mvebu: add suspend/resume DT information for Armada XP GP
  ARM: mvebu: synchronize secondary CPU clocks on resume
  ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
  ARM: mvebu: Armada XP GP specific suspend/resume code
  ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
  ARM: mvebu: implement suspend/resume support for Armada XP
  clk: mvebu: add suspend/resume for gatable clocks
  bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
  bus: mvebu-mbus: suspend/resume support
  clocksource: time-armada-370-xp: add suspend/resume support
  irqchip: armada-370-xp: Add suspend/resume support
  Documentation: dt-bindings: minimal documentation for MVEBU SDRAM controller

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

ab64920c3742ba992a3bf0b06f9750d1cad9d050
diff --cc arch/arm/mach-mvebu/pmsu.h
index c2c95db4f648,a7c242dc2ebd..ea79269c2702
--- a/arch/arm/mach-mvebu/pmsu.h
+++ b/arch/arm/mach-mvebu/pmsu.h
@@@ -17,7 -17,6 +17,8 @@@ int mvebu_setup_boot_addr_wa(unsigned i
                               phys_addr_t resume_addr_reg);
  
  void mvebu_v7_pmsu_idle_exit(void);
+ void armada_370_xp_cpu_resume(void);
  
 +int armada_370_xp_pmsu_idle_enter(unsigned long deepidle);
 +int armada_38x_do_cpu_suspend(unsigned long deepidle);
  #endif	/* __MACH_370_XP_PMSU_H */