2020-05-05 15:49:01

by Geert Uytterhoeven

Subject: [PATCH v2 0/3] ARM: Replace <linux/clk-provider.h> by <linux/of_clk.h>

Hi arm-soc folks,

The OF clock helpers were moved to <linux/of_clk.h> a while ago.
Hence code that is not a clock provider, but just needs to call
of_clk_init(), can (and should) include <linux/of_clk.h> instead of
<linux/clk-provider.h>.

This series contains the patches from [1] that haven't been applied yet.

Changes compared to v1:
- Add Reviewed-by.

Thanks for applying!

[2] "[PATCH 0/7] ARM: Replace <linux/clk-provider.h> by <linux/of_clk.h>"
https://lore.kernel.org/r/[email protected]

Geert Uytterhoeven (3):
ARM/time: Replace <linux/clk-provider.h> by <linux/of_clk.h>
ARM: mediatek: Replace <linux/clk-provider.h> by <linux/of_clk.h>
ARM: mmp: Replace <linux/clk-provider.h> by <linux/of_clk.h>

arch/arm/kernel/time.c | 2 +-
arch/arm/mach-mediatek/mediatek.c | 2 +-
arch/arm/mach-mmp/mmp-dt.c | 2 +-
arch/arm/mach-mmp/mmp2-dt.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

--
2.17.1

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2020-05-05 15:50:19

by Geert Uytterhoeven

Subject: [PATCH v2 1/3] ARM/time: Replace <linux/clk-provider.h> by <linux/of_clk.h>

The ARM time 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]>
---
v2:
- Add Reviewed-by.
---
arch/arm/kernel/time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index dddc7ebf4db4418d..09b149b09c43850b 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -8,7 +8,6 @@
* This file contains the ARM-specific time handling details:
* reading the RTC at bootup, etc...
*/
-#include <linux/clk-provider.h>
#include <linux/clockchips.h>
#include <linux/clocksource.h>
#include <linux/errno.h>
@@ -17,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h>
+#include <linux/of_clk.h>
#include <linux/profile.h>
#include <linux/sched.h>
#include <linux/sched_clock.h>
--
2.17.1

2020-05-05 15:50:41

by Geert Uytterhoeven

Subject: [PATCH v2 3/3] ARM: mmp: Replace <linux/clk-provider.h> by <linux/of_clk.h>

The Marvell MMP 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]>
---
v2:
- Add Reviewed-by.
---
arch/arm/mach-mmp/mmp-dt.c | 2 +-
arch/arm/mach-mmp/mmp2-dt.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
index 91214996acecc9fb..3f43c0867dcae4ed 100644
--- a/arch/arm/mach-mmp/mmp-dt.c
+++ b/arch/arm/mach-mmp/mmp-dt.c
@@ -8,7 +8,7 @@

#include <linux/irqchip.h>
#include <linux/of_platform.h>
-#include <linux/clk-provider.h>
+#include <linux/of_clk.h>
#include <linux/clocksource.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c
index 510c762ddc484c40..34a5fe4b3949167e 100644
--- a/arch/arm/mach-mmp/mmp2-dt.c
+++ b/arch/arm/mach-mmp/mmp2-dt.c
@@ -9,7 +9,7 @@
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/of_platform.h>
-#include <linux/clk-provider.h>
+#include <linux/of_clk.h>
#include <linux/clocksource.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
--
2.17.1

2020-05-05 15:51:48

by Lubomir Rintel

Subject: Re: [PATCH v2 3/3] ARM: mmp: Replace <linux/clk-provider.h> by <linux/of_clk.h>

On Tue, May 05, 2020 at 05:45:36PM +0200, Geert Uytterhoeven wrote:
> The Marvell MMP 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]>

Acked-by: Lubomir Rintel <[email protected]>

> ---
> v2:
> - Add Reviewed-by.
> ---
> arch/arm/mach-mmp/mmp-dt.c | 2 +-
> arch/arm/mach-mmp/mmp2-dt.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
> index 91214996acecc9fb..3f43c0867dcae4ed 100644
> --- a/arch/arm/mach-mmp/mmp-dt.c
> +++ b/arch/arm/mach-mmp/mmp-dt.c
> @@ -8,7 +8,7 @@
>
> #include <linux/irqchip.h>
> #include <linux/of_platform.h>
> -#include <linux/clk-provider.h>
> +#include <linux/of_clk.h>
> #include <linux/clocksource.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/time.h>
> diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c
> index 510c762ddc484c40..34a5fe4b3949167e 100644
> --- a/arch/arm/mach-mmp/mmp2-dt.c
> +++ b/arch/arm/mach-mmp/mmp2-dt.c
> @@ -9,7 +9,7 @@
> #include <linux/io.h>
> #include <linux/irqchip.h>
> #include <linux/of_platform.h>
> -#include <linux/clk-provider.h>
> +#include <linux/of_clk.h>
> #include <linux/clocksource.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/time.h>
> --
> 2.17.1
>