From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> As the first step in switching to using the genpd driver in DT mode, check if a relevant genpd node exists and don't setup the clock pm in this case. Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx> --- arch/arm/mach-davinci/pm_domain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c index 78eac2c0c146..98a4f3fcba50 100644 --- a/arch/arm/mach-davinci/pm_domain.c +++ b/arch/arm/mach-davinci/pm_domain.c @@ -13,6 +13,7 @@ #include <linux/pm_runtime.h> #include <linux/pm_clock.h> #include <linux/platform_device.h> +#include <linux/of.h> static struct dev_pm_domain davinci_pm_domain = { .ops = { @@ -28,7 +29,13 @@ static struct pm_clk_notifier_block platform_bus_notifier = { static int __init davinci_pm_runtime_init(void) { - pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier); + struct device_node *np; + + /* Use pm_clk as fallback if we're not using genpd. */ + np = of_find_compatible_node(NULL, NULL, "ti,davinci-pm-domains"); + if (!np) + pm_clk_add_notifier(&platform_bus_type, + &platform_bus_notifier); return 0; } -- 2.16.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html