Merge branches 'acpi-soc', 'acpi-misc', 'acpi-pci' and 'device-properties'

[deliverable/linux.git] / arch / arm / mach-imx / gpc.c

diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index cfc696b972f323e07b5e9a180755130e63e5e1b2..fd87205324710ffcfca1871c01ea23a7da8856b4 100644 (file)
--- 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,
        },
 };