diff options
author | Mattias Nilsson <mattias.i.nilsson@stericsson.com> | 2011-05-23 11:03:10 +0200 |
---|---|---|
committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:42:03 +0200 |
commit | 777a6679baca03511f350b272a1122d3869c1bc9 (patch) | |
tree | bac68f86fa9df866ae43548a6ac36085b5af5a85 /arch/arm/mach-ux500/pm | |
parent | de3722f0b512e0942df8696e1212d135dca3a30f (diff) |
arm: ux500: common dbx500 prcmu driver api
This patch updates the PRCMU driver API to be the same
(as far as possible) in U8500 and U4500.
- <mach/prcmu-fw-api.h> has been renamed <mach/prcmu.h>.
- The platform specific APIs have moved to <mach/prcmu-db5500.h>
and <mach/prcmu-db8500.h> (but these should not be directly
included).
- The PRCMU QoS API has been put in <mach/prcmu-qos.h>.
ST Ericsson ID: 334772
ST Ericsson FOSS-OUT ID: trivial
ST Ericsson Linux next: 318371
Change-Id: I6ce117ec35ebf2e987178ccacce09afb554d2736
Signed-off-by: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23863
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/pm')
-rw-r--r-- | arch/arm/mach-ux500/pm/cpufreq-db8500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/cpufreq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/cpuidle.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/cpuidle.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/suspend.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-ux500/pm/cpufreq-db8500.c b/arch/arm/mach-ux500/pm/cpufreq-db8500.c index 0d7173eb4dd..9b2f2b15e01 100644 --- a/arch/arm/mach-ux500/pm/cpufreq-db8500.c +++ b/arch/arm/mach-ux500/pm/cpufreq-db8500.c @@ -7,7 +7,7 @@ #include <linux/kernel.h> #include <linux/cpufreq.h> -#include <mach/prcmu-fw-api.h> +#include <mach/prcmu.h> #include "cpufreq.h" diff --git a/arch/arm/mach-ux500/pm/cpufreq.c b/arch/arm/mach-ux500/pm/cpufreq.c index 4583372094a..0c28eb79906 100644 --- a/arch/arm/mach-ux500/pm/cpufreq.c +++ b/arch/arm/mach-ux500/pm/cpufreq.c @@ -14,7 +14,7 @@ #include <linux/slab.h> #include <mach/hardware.h> -#include <mach/prcmu-fw-api.h> +#include <mach/prcmu.h> #include <mach/prcmu-regs.h> static struct cpufreq_frequency_table *freq_table; diff --git a/arch/arm/mach-ux500/pm/cpuidle.c b/arch/arm/mach-ux500/pm/cpuidle.c index 522cf4b39ee..7c8bb5bf0e8 100644 --- a/arch/arm/mach-ux500/pm/cpuidle.c +++ b/arch/arm/mach-ux500/pm/cpuidle.c @@ -18,7 +18,7 @@ #include <linux/gpio.h> -#include <mach/prcmu-fw-api.h> +#include <mach/prcmu.h> #include "cpuidle.h" #include "cpuidle_dbg.h" @@ -65,7 +65,7 @@ static struct cstate cstates[] = { .ARM_PLL = ARM_PLL_ON, .UL_PLL = UL_PLL_ON, .ESRAM = ESRAM_RET, - .pwrst = NO_TRANSITION, + .pwrst = PRCMU_AP_NO_CHANGE, .state = CI_RUNNING, .desc = "Running ", }, @@ -80,7 +80,7 @@ static struct cstate cstates[] = { .ARM_PLL = ARM_PLL_ON, .UL_PLL = UL_PLL_ON, .ESRAM = ESRAM_RET, - .pwrst = NO_TRANSITION, + .pwrst = PRCMU_AP_NO_CHANGE, .flags = CPUIDLE_FLAG_TIME_VALID, .state = CI_WFI, .desc = "Wait for interrupt ", diff --git a/arch/arm/mach-ux500/pm/cpuidle.h b/arch/arm/mach-ux500/pm/cpuidle.h index 618e0f969e5..f15338aa48b 100644 --- a/arch/arm/mach-ux500/pm/cpuidle.h +++ b/arch/arm/mach-ux500/pm/cpuidle.h @@ -11,8 +11,6 @@ #include <linux/cpuidle.h> -#include <mach/prcmu-fw-defs_v1.h> - enum ARM { ARM_OFF, ARM_RET, @@ -62,7 +60,7 @@ struct cstate { u32 power_usage; u32 threshold; u32 flags; - enum ap_pwrst_trans pwrst; + u8 pwrst; /* Only used for debugging purpose */ enum ci_pwrst state; diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c index 56977de72e6..0c0c1dfd317 100644 --- a/arch/arm/mach-ux500/pm/suspend.c +++ b/arch/arm/mach-ux500/pm/suspend.c @@ -15,7 +15,7 @@ #include <linux/delay.h> #include <linux/regulator/ab8500-debug.h> -#include <mach/prcmu-fw-api.h> +#include <mach/prcmu.h> #include <mach/prcmu-regs.h> #include "context.h" |