Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into...

The following samsung branches are based on these cleanups,
which are already in mainline before this branch gets pulled.

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/exynos.c
index c7d960a,46d893f,80cbbc7,f38cf7c..2a43a17
--- 1/arch/arm/mach-exynos/exynos.c
--- 2/arch/arm/mach-exynos/exynos.c
--- 3/arch/arm/mach-exynos/exynos.c
--- 4/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@@@ -295,12 -295,10 -332,10 -297,10 +332,12 @@@@@ static void __init exynos_dt_machine_in
         * This is called from smp_prepare_cpus if we've built for SMP, but
         * we still need to set it up for PM and firmware ops if not.
         */
   -    if (!IS_ENABLED(SMP))
   +    if (!IS_ENABLED(CONFIG_SMP))
                exynos_sysram_init();
    
 ---    exynos_cpuidle_init();
 +++    if (!of_machine_is_compatible("samsung,exynos5420"))
 +++            exynos_cpuidle_init();
 +++
        exynos_cpufreq_init();
    
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

diff --cc arch/arm/mach-exynos/hotplug.c
index 8a134d0,920a4ba,572f6b1,69fa483..4d86961
--- 1/arch/arm/mach-exynos/hotplug.c
--- 2/arch/arm/mach-exynos/hotplug.c
--- 3/arch/arm/mach-exynos/hotplug.c
--- 4/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@@@@ -40,15 -40,17 -39,15 -40,21 +39,17 @@@@@ static inline void cpu_leave_lowpower(v
    
    static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
    {
+ ++    u32 mpidr = cpu_logical_map(cpu);
+ ++    u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+ ++
        for (;;) {
    
- --            /* make cpu1 to be turned off at next WFI command */
- --            if (cpu == 1)
- --                    exynos_cpu_power_down(cpu);
+ ++            /* Turn the CPU off on next WFI instruction. */
+ ++            exynos_cpu_power_down(core_id);
    
   -            /*
   -             * here's the WFI
   -             */
   -            asm(".word      0xe320f003\n"
   -                :
   -                :
   -                : "memory", "cc");
   +            wfi();
    
- --            if (pen_release == cpu_logical_map(cpu)) {
+ ++            if (pen_release == core_id) {
                        /*
                         * OK, proper wakeup, we're done
                         */

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-exynos/regs-pmu.h
Simple merge

diff --cc arch/arm/mach-mvebu/pmsu.c
index 34f173e,25aa823,a1d407c,53a55c8..b31a829
--- 1/arch/arm/mach-mvebu/pmsu.c
--- 2/arch/arm/mach-mvebu/pmsu.c
--- 3/arch/arm/mach-mvebu/pmsu.c
--- 4/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@@@@ -142,8 -142,8 -142,8 -140,15 +142,8 @@@@@ static void armada_370_xp_pmsu_enable_l
        writel(reg, pmsu_mp_base + L2C_NFABRIC_PM_CTL);
    }
    
   -static void armada_370_xp_cpu_resume(void)
   -{
   -    asm volatile("bl    ll_add_cpu_to_smp_group\n\t"
   -                 "bl    ll_enable_coherency\n\t"
   -                 "b     cpu_resume\n\t");
   -}
   -
    /* No locking is needed because we only access per-CPU registers */
 ---void armada_370_xp_pmsu_idle_prepare(bool deepidle)
 +++int armada_370_xp_pmsu_idle_enter(unsigned long deepidle)
    {
        unsigned int hw_cpu = cpu_logical_map(smp_processor_id());
        u32 reg;