From b338a2663417b3a27a154e8cabc68c435b78dd3a Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Mon, 16 Nov 2009 17:21:34 +0530 Subject: [PATCH] --- yaml --- r: 183189 b: refs/heads/master c: 7ec4b24326ec9b0467ab23b0417ec6b63e8e5524 h: refs/heads/master i: 183187: c659566cb21c635a53a08fd01eb73b1c0278ccf6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/cpuidle.c | 5 +---- trunk/arch/arm/mach-davinci/include/mach/memory.h | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 93ecb03faa1b..bfb3cadd7dec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a219a9ecf49ab156df4c18267ade4d468d9930e +refs/heads/master: 7ec4b24326ec9b0467ab23b0417ec6b63e8e5524 diff --git a/trunk/arch/arm/mach-davinci/cpuidle.c b/trunk/arch/arm/mach-davinci/cpuidle.c index 97a90f36fc92..beda3b579688 100644 --- a/trunk/arch/arm/mach-davinci/cpuidle.c +++ b/trunk/arch/arm/mach-davinci/cpuidle.c @@ -19,6 +19,7 @@ #include #include +#include #define DAVINCI_CPUIDLE_MAX_STATES 2 @@ -39,10 +40,6 @@ static struct cpuidle_driver davinci_idle_driver = { static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device); static void __iomem *ddr2_reg_base; -#define DDR2_SDRCR_OFFSET 0xc -#define DDR2_SRPD_BIT BIT(23) -#define DDR2_LPMODEN_BIT BIT(31) - static void davinci_save_ddr_power(int enter, bool pdown) { u32 val; diff --git a/trunk/arch/arm/mach-davinci/include/mach/memory.h b/trunk/arch/arm/mach-davinci/include/mach/memory.h index 80309aed534a..7aeaf46cade0 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/memory.h +++ b/trunk/arch/arm/mach-davinci/include/mach/memory.h @@ -31,6 +31,10 @@ #define PHYS_OFFSET DAVINCI_DDR_BASE #endif +#define DDR2_SDRCR_OFFSET 0xc +#define DDR2_SRPD_BIT BIT(23) +#define DDR2_LPMODEN_BIT BIT(31) + /* * Increase size of DMA-consistent memory region */