From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 24 Jul 2014 11:41:36 +0000 (+0000)
Subject: Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5abe65e3d67aac9f9b5c08660f817a2d6ec5515f;p=linux-beck.git

Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
---

5abe65e3d67aac9f9b5c08660f817a2d6ec5515f
diff --cc arch/arm/mach-mvebu/Makefile
index 90bcd5327312,1636cdbef01a..bc7689e530a4
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@@ -7,8 -7,9 +7,8 @@@ CFLAGS_pmsu.o			:= -march=armv7-
  obj-y				 += system-controller.o mvebu-soc-id.o
  
  ifeq ($(CONFIG_MACH_MVEBU_V7),y)
- obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
+ obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o
  obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
 -obj-$(CONFIG_HOTPLUG_CPU)	 += hotplug.o
  endif
  
  obj-$(CONFIG_MACH_DOVE)		 += dove.o
diff --cc arch/arm/mach-mvebu/pmsu.c
index 9c819d65b337,25aa8237d668..b31a8293a347
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@@ -140,15 -142,8 +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;