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

Commit 1773232e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpuidle' 

* pm-cpuidle:
  ARM: AT91: DT: pm: Select ram controller standby based on DT
  ARM: AT91: pm: Factorize standby function
  ARM: at91: cpuidle: Move driver to drivers/cpuidle
  ARM: at91: cpuidle: Convert to platform driver
  ARM: ux500: cpuidle: fix section mismatch
  ARM: zynq: cpuidle: convert to platform driver
  ARM: zynq: cpuidle: Remove useless compatibility string
  drivers: cpuidle: rename ARM big.LITTLE driver config and makefile entries
  ARM: EXYNOS: convert cpuidle driver to be a platform driver
  intel_idle: mark some functions with __init tag
  intel_idle: mark states tables with __initdata tag
  intel_idle: shrink states tables
parents 6e2d9b60 80b1ce57

arch/arm/mach-at91/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ obj-y += leds.o 
# Power Management

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_AT91_SLOW_CLOCK)	+= pm_slowclock.o

obj-$(CONFIG_CPU_IDLE)	+= cpuidle.o



ifeq ($(CONFIG_PM_DEBUG),y)

CFLAGS_pm.o += -DDEBUG

arch/arm/mach-at91/at91rm9200.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "generic.h"

#include "clock.h"

#include "sam9_smc.h"

#include "pm.h"



/* --------------------------------------------------------------------

 *  Clocks
@@ -327,6 +328,7 @@ static void __init at91rm9200_ioremap_registers(void) 
{

	at91rm9200_ioremap_st(AT91RM9200_BASE_ST);

	at91_ioremap_ramc(0, AT91RM9200_BASE_MC, 256);

	at91_pm_set_standby(at91rm9200_standby);

}



static void __init at91rm9200_initialize(void)

arch/arm/mach-at91/at91sam9260.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "generic.h"

#include "clock.h"

#include "sam9_smc.h"

#include "pm.h"



/* --------------------------------------------------------------------

 *  Clocks
@@ -342,6 +343,7 @@ static void __init at91sam9260_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9260_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9260_initialize(void)

arch/arm/mach-at91/at91sam9261.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "generic.h"

#include "clock.h"

#include "sam9_smc.h"

#include "pm.h"



/* --------------------------------------------------------------------

 *  Clocks
@@ -284,6 +285,7 @@ static void __init at91sam9261_ioremap_registers(void) 
	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9261_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9261_initialize(void)

arch/arm/mach-at91/at91sam9263.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "generic.h"

#include "clock.h"

#include "sam9_smc.h"

#include "pm.h"



/* --------------------------------------------------------------------

 *  Clocks
@@ -321,6 +322,7 @@ static void __init at91sam9263_ioremap_registers(void) 
	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);

	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);

	at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9263_initialize(void)