• Arnd Bergmann's avatar
    Merge tag 'samsung-pm-2' of... · 2c793fa3
    Arnd Bergmann authored
    Merge tag 'samsung-pm-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3
    
    Merge "Samsung PM related 2nd updates for v3.15" from Kukjin Kim:
    
    From Tomasz Figa <t.figa@samsung.com>:
    Current Samsung PM code is heavily unprepared for multiplatform
    systems. The design implies accessing functions and global
    variables defined in particular mach- subdirectory from common
    code in plat-, which is not allowed when building ARCH_MULTIPLATFORM.
    In addition there is a lot of forced code unification, which makes
    common function handle any possible quirks of all supported SoCs.
    In the end this design turned out to not work too well, ending with
    a lot of empty functions exported from mach-, just because code in
    common pm.c calls them. Moreover, recent trend of moving lower level
    suspend/resume code to proper drivers, like pinctrl or clk, made a
    lot of code there redundant, especially on DT-only platforms like
    Exynos.
    
    Note that this branch is based on previous tags/samsung-pm-1 and merge
    tags/samsung-cleanup-2 because of fix build error from recent changes
    of <linux/serial_s3c.h>
    
    * tag 'samsung-pm-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: EXYNOS: Fix compilation error in cpuidle.c
      ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
      ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
      serial: s3c: Fix build of header without serial_core.h preinclusion
      ARM: EXYNOS: Allow wake-up using GIC interrupts
      ARM: EXYNOS: Stop using legacy Samsung PM code
      ARM: EXYNOS: Remove PM initcalls and useless indirection
      ARM: EXYNOS: Fix abuse of CONFIG_PM
      ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
      ARM: SAMSUNG: Move common save/restore helpers to separate file
      ARM: SAMSUNG: Move Samsung PM debug code into separate file
      ARM: SAMSUNG: Consolidate PM debug functions
      ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
      ARM: SAMSUNG: Save UART DIVSLOT register based on SoC type
      ARM: SAMSUNG: Add soc_is_s3c2410() helper
      ARM: EXYNOS: Do not resume l2x0 if not enabled before suspend
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    2c793fa3
pm.c 4.75 KB