From mboxrd@z Thu Jan 1 00:00:00 1970 From: brgl@bgdev.pl (Bartosz Golaszewski) Date: Wed, 7 Feb 2018 14:45:49 +0100 Subject: [PATCH 3/7] ARM: davinci: don't setup pm_clk if we're using genpd In-Reply-To: <20180207134553.13510-1-brgl@bgdev.pl> References: <20180207134553.13510-1-brgl@bgdev.pl> Message-ID: <20180207134553.13510-4-brgl@bgdev.pl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Bartosz Golaszewski 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 --- 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 #include #include +#include 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartosz Golaszewski Subject: [PATCH 3/7] ARM: davinci: don't setup pm_clk if we're using genpd Date: Wed, 7 Feb 2018 14:45:49 +0100 Message-ID: <20180207134553.13510-4-brgl@bgdev.pl> References: <20180207134553.13510-1-brgl@bgdev.pl> Return-path: In-Reply-To: <20180207134553.13510-1-brgl@bgdev.pl> Sender: linux-kernel-owner@vger.kernel.org To: Rob Herring , Mark Rutland , Sekhar Nori , Kevin Hilman , Russell King , David Lechner Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski List-Id: devicetree@vger.kernel.org From: Bartosz Golaszewski 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 --- 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 #include #include +#include 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