summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAxel Haslam2016-02-15 11:10:52 +0100
committerRafael J. Wysocki2016-02-15 23:18:15 +0100
commiteaa2d73ef9985f9e0fee7c3f04268c729100498d (patch)
treeba3829da69f032fb6c307649830d01c26cd1007d /arch/arm
parentPM / Domains: Support for multiple states (diff)
downloadkernel-qcow2-linux-eaa2d73ef9985f9e0fee7c3f04268c729100498d.tar.gz
kernel-qcow2-linux-eaa2d73ef9985f9e0fee7c3f04268c729100498d.tar.xz
kernel-qcow2-linux-eaa2d73ef9985f9e0fee7c3f04268c729100498d.zip
ARM: imx6: pm: declare pm domain latency on power_state struct
The generic_pm_domain structure uses an array of latencies to be able to declare multiple intermediate states. Declare a single "OFF" state with the default latencies So that the power_off_latency_ns and power_on_latency_ns fields of generic_pm_domain structure can be eventually removed. [ Lina: pm_genpd_init() argument changev ] Signed-off-by: Lina Iyer <lina.iyer@linaro.org> Signed-off-by: Axel Haslam <ahaslam+renesas@baylibre.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/gpc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index cfc696b972f3..fd8720532471 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -374,8 +374,13 @@ static struct pu_domain imx6q_pu_domain = {
.name = "PU",
.power_off = imx6q_pm_pu_power_off,
.power_on = imx6q_pm_pu_power_on,
- .power_off_latency_ns = 25000,
- .power_on_latency_ns = 2000000,
+ .states = {
+ [0] = {
+ .power_off_latency_ns = 25000,
+ .power_on_latency_ns = 2000000,
+ },
+ },
+ .state_count = 1,
},
};