Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11da7df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC power management and clock changes from Olof Johansson:
 "This branch contains a largeish set of updates of power management and
  clock setup.  The bulk of it is for OMAP/AM33xx platforms, but also a
  few around hotplug/suspend/resume on Exynos.

  It includes a split-up of some of the OMAP clock data into separate
  files which adds to the diffstat, but gross delta is fairly reasonable."

* tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
  ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
  ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
  watchdog: OMAP: fixup for ARM multiplatform support
  ARM: EXYNOS: Add flush_cache_all in suspend finisher
  ARM: EXYNOS: Remove scu_enable from cpuidle
  ARM: EXYNOS: Fix soft reboot hang after suspend/resume
  ARM: EXYNOS: Add support for rtc wakeup
  ARM: EXYNOS: fix the hotplug for Cortex-A15
  ARM: OMAP2+: omap_device: Correct resource handling for DT boot
  ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
  ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
  ARM: OMAP2+: PRM: initialize some PRM functions early
  ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
  ARM: OMAP4: USB: power down MUSB PHY during boot
  ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP2xxx: clock: drop obsolete clock data
  ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
  ARM: AM33xx: clock: drop obsolete clock data
  ARM: OMAP3xxx: clk: drop obsolete clock data
  ...
parents b8edf848 9c7466b2

arch/arm/mach-exynos/common.c

+2 −0
Original line number Diff line number Diff line
@@ -680,6 +680,8 @@ void __init exynos5_init_irq(void) 
	 * uses GIC instead of VIC.

	 */

	s5p_init_irq(NULL, 0);



	gic_arch_extn.irq_set_wake = s3c_irq_wake;

}



struct bus_type exynos_subsys = {

arch/arm/mach-exynos/cpuidle.c

+2 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, 
	cpu_suspend(0, idle_finisher);



#ifdef CONFIG_SMP

	if (!soc_is_exynos5250())

		scu_enable(S5P_VA_SCU);

#endif

	cpu_pm_exit();

arch/arm/mach-exynos/hotplug.c

+42 −3
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
#include <asm/smp_plat.h>



#include <mach/regs-pmu.h>

#include <plat/cpu.h>



#include "common.h"



static inline void cpu_enter_lowpower(void)

static inline void cpu_enter_lowpower_a9(void)

{

	unsigned int v;
@@ -45,6 +46,35 @@ static inline void cpu_enter_lowpower(void) 
	  : "cc");

}



static inline void cpu_enter_lowpower_a15(void)

{

	unsigned int v;



	asm volatile(

	"	mrc	p15, 0, %0, c1, c0, 0\n"

	"	bic	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	  : "=&r" (v)

	  : "Ir" (CR_C)

	  : "cc");



	flush_cache_louis();



	asm volatile(

	/*

	* Turn off coherency

	*/

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	bic	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	: "=&r" (v)

	: "Ir" (0x40)

	: "cc");



	isb();

	dsb();

}



static inline void cpu_leave_lowpower(void)

{

	unsigned int v;
@@ -103,11 +133,20 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) 
void __ref exynos_cpu_die(unsigned int cpu)

{

	int spurious = 0;

	int primary_part = 0;



	/*

	 * we're ready for shutdown now, so do it

	 * we're ready for shutdown now, so do it.

	 * Exynos4 is A9 based while Exynos5 is A15; check the CPU part

	 * number by reading the Main ID register and then perform the

	 * appropriate sequence for entering low power.

	 */

	cpu_enter_lowpower();

	asm("mrc p15, 0, %0, c0, c0, 0" : "=r"(primary_part) : : "cc");

	if ((primary_part & 0xfff0) == 0xc0f0)

		cpu_enter_lowpower_a15();

	else

		cpu_enter_lowpower_a9();



	platform_do_lowpower(cpu, &spurious);



	/*

arch/arm/mach-exynos/pm.c

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ static int exynos_cpu_suspend(unsigned long arg) 
	outer_flush_all();

#endif



	if (soc_is_exynos5250())

		flush_cache_all();



	/* issue the standby signal into the pm unit. */

	cpu_do_idle();
@@ -312,6 +315,10 @@ static void exynos_pm_resume(void) 
	}



early_wakeup:



	/* Clear SLEEP mode set in INFORM1 */

	__raw_writel(0x0, S5P_INFORM1);



	return;

}

arch/arm/mach-omap1/board-h2.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/mach/map.h>



#include <mach/mux.h>

#include <plat-omap/dma-omap.h>

#include <linux/omap-dma.h>

#include <mach/tc.h>

#include <mach/irda.h>

#include <linux/platform_data/keypad-omap.h>