Merge branch 'pm-domains'

* pm-domains:
  PM / Domains: Fix compatible for domain idle state
  PM / Domains: Do not print PM domain add error message if EPROBE_DEFER
  PM / Domains: Fix a warning message
  PM / Domains: check for negative return from of_count_phandle_with_args()
  PM / doc: Update device documentation for devices in IRQ-safe PM domains
  PM / Domains: Support IRQ safe PM domains
  PM / Domains: Abstract genpd locking
  dt/bindings / PM/Domains: Update binding for PM domain idle states
  PM / Domains: Save the fwnode in genpd_power_state
  PM / Domains: Allow domain power states to be read from DT
  PM / Domains: Add residency property to genpd states
  PM / Domains: Make genpd state allocation dynamic

Conflicts:
	arch/arm/mach-imx/gpc.c

1 files changed, 10 insertions, 7 deletions

diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index b54db47f6f32..1dc2a34b9dbd 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -380,13 +380,6 @@ static struct pu_domain imx6q_pu_domain = {
                 .name = "PU",
                 .power_off = imx6q_pm_pu_power_off,
                 .power_on = imx6q_pm_pu_power_on,
-                .states = {
-                        [0] = {
-                                .power_off_latency_ns = 25000,
-                                .power_on_latency_ns = 2000000,
-                        },
-                },
-                .state_count = 1,
         },
 };
 
@@ -430,6 +423,16 @@ static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg)
         if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
                 return 0;
 
+        imx6q_pu_domain.base.states = devm_kzalloc(dev,
+                                        sizeof(*imx6q_pu_domain.base.states),
+                                        GFP_KERNEL);
+        if (!imx6q_pu_domain.base.states)
+                return -ENOMEM;
+
+        imx6q_pu_domain.base.states[0].power_off_latency_ns = 25000;
+        imx6q_pu_domain.base.states[0].power_on_latency_ns = 2000000;
+        imx6q_pu_domain.base.state_count = 1;
+
         for (i = 0; i < ARRAY_SIZE(imx_gpc_domains); i++)
                 pm_genpd_init(imx_gpc_domains[i], NULL, false);