@@ -16,6 +16,7 @@
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/pm_runtime.h>
+#include <linux/of.h>
#ifdef CONFIG_PM
@@ -323,6 +324,7 @@ int pm_clk_resume(struct device *dev)
* of PM clocks, depending on @action.
*
* If the device's pm_domain field is already populated with a value different
+ * or is expected to be populated with a different value later (in case of DT)
* from the one stored in the struct pm_clk_notifier_block object, the function
* does nothing.
*/
@@ -332,7 +334,7 @@ static int pm_clk_notify(struct notifier_block *nb,
struct pm_clk_notifier_block *clknb;
struct device *dev = data;
char **con_id;
- int error;
+ int error, sz;
dev_dbg(dev, "%s() %ld\n", __func__, action);
@@ -343,6 +345,10 @@ static int pm_clk_notify(struct notifier_block *nb,
if (dev->pm_domain)
break;
+ /* With DT dev->pm_domain hookup happens later */
+ if (of_find_property(dev->of_node, "power-domains", &sz))
+ break;
+
error = pm_clk_create(dev);
if (error)
break;
pm_clk_notify() intends to do nothing if the device is associated with a pm_domain other than whats stored in pm_clk_notifier_block. In case of DT though, just checking for an existing dev->pm_domain is not very useful as dev->pm_domain actually gets populated much later. Add a check for a 'power-domains' DT property to identify if the device would be assocaiated with a different power domain at a later point in time. Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org> --- drivers/base/power/clock_ops.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)