2020-02-12 10:09:09

by Geert Uytterhoeven

Subject: [PATCH 7/7] ARM: zynq: Replace <linux/clk-provider.h> by <linux/of_clk.h>

The Zynq platform code is not a clock provider, and just needs to call
of_clk_init().

Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/arm/mach-zynq/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 3a4248fd796281c3..a9dd2f71cd19d2a9 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -12,10 +12,10 @@
#include <linux/cpumask.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
-#include <linux/clk-provider.h>
#include <linux/clk/zynq.h>
#include <linux/clocksource.h>
#include <linux/of_address.h>
+#include <linux/of_clk.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/of.h>
--
2.17.1

2020-02-12 11:15:21

by Michal Simek

Subject: Re: [PATCH 7/7] ARM: zynq: Replace <linux/clk-provider.h> by <linux/of_clk.h>

On 12. 02. 20 11:08, Geert Uytterhoeven wrote:
> The Zynq platform code is not a clock provider, and just needs to call
> of_clk_init().
>
> Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> arch/arm/mach-zynq/common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
> index 3a4248fd796281c3..a9dd2f71cd19d2a9 100644
> --- a/arch/arm/mach-zynq/common.c
> +++ b/arch/arm/mach-zynq/common.c
> @@ -12,10 +12,10 @@
> #include <linux/cpumask.h>
> #include <linux/platform_device.h>
> #include <linux/clk.h>
> -#include <linux/clk-provider.h>
> #include <linux/clk/zynq.h>
> #include <linux/clocksource.h>
> #include <linux/of_address.h>
> +#include <linux/of_clk.h>
> #include <linux/of_irq.h>
> #include <linux/of_platform.h>
> #include <linux/of.h>
>

Looks good. Applied to zynq/soc.

Thanks,
Michal

2020-02-12 17:11:13

by Stephen Boyd

Subject: Re: [PATCH 7/7] ARM: zynq: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Quoting Geert Uytterhoeven (2020-02-12 02:08:30)
> The Zynq platform code is not a clock provider, and just needs to call
> of_clk_init().
>
> Hence it can include <linux/of_clk.h> instead of <linux/clk-provider.h>.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Reviewed-by: Stephen Boyd <[email protected]>